summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Green <jason@jasg.org>2016-08-23 07:02:44 +0000
committerJason Green <jason@jasg.org>2016-08-23 07:04:55 +0000
commit7009112752ed0729b9c20382c936a8d373062ada (patch)
tree77aa0a3c49e22f2ab8ab896a6854a1b34cd8b94a
parent104ca8a5e1a9f3a30c0fa149556b5424684905dd (diff)
downloadqmk_firmware-7009112752ed0729b9c20382c936a8d373062ada.tar.gz
qmk_firmware-7009112752ed0729b9c20382c936a8d373062ada.zip
move to ergodox-ez only
-rw-r--r--keyboards/ergodox/ez/keymaps/steno/Makefile (renamed from keyboards/ergodox/keymaps/steno/Makefile)0
-rw-r--r--keyboards/ergodox/ez/keymaps/steno/keymap.c (renamed from keyboards/ergodox/keymaps/steno/keymap.c)0
-rw-r--r--keyboards/ergodox/ez/keymaps/steno/readme.md (renamed from keyboards/ergodox/keymaps/steno/readme.md)0
-rw-r--r--tmk_core/protocol/lufa/lufa.c2
4 files changed, 1 insertions, 1 deletions
diff --git a/keyboards/ergodox/keymaps/steno/Makefile b/keyboards/ergodox/ez/keymaps/steno/Makefile
index b6fb9b1a80..b6fb9b1a80 100644
--- a/keyboards/ergodox/keymaps/steno/Makefile
+++ b/keyboards/ergodox/ez/keymaps/steno/Makefile
diff --git a/keyboards/ergodox/keymaps/steno/keymap.c b/keyboards/ergodox/ez/keymaps/steno/keymap.c
index 3e9830905c..3e9830905c 100644
--- a/keyboards/ergodox/keymaps/steno/keymap.c
+++ b/keyboards/ergodox/ez/keymaps/steno/keymap.c
diff --git a/keyboards/ergodox/keymaps/steno/readme.md b/keyboards/ergodox/ez/keymaps/steno/readme.md
index d67cde2a3c..d67cde2a3c 100644
--- a/keyboards/ergodox/keymaps/steno/readme.md
+++ b/keyboards/ergodox/ez/keymaps/steno/readme.md
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index af73f34d7b..9b201374a2 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -881,7 +881,7 @@ void virtser_init(void)
CDC_Device_SendControlLineStateChange(&cdc_device);
}
-__attribute__ ((weak))
+void virtser_recv(uint8_t c) __attribute__ ((weak));
void virtser_recv(uint8_t c)
{
// Ignore by default