diff options
| author | Olivier <olivier@gid0.org> | 2016-04-17 19:54:06 +0200 |
|---|---|---|
| committer | Olivier <olivier@gid0.org> | 2016-04-17 19:54:06 +0200 |
| commit | b03a9f7252781b7fee75a684ba77650dc195dca5 (patch) | |
| tree | 43d6a80f4f4cf47c5f571397a0a17ec6e7ef0083 /tmk_core/common/keyboard.c | |
| parent | 0715cf46ac369921fd39b1b62d8a95fc89d48244 (diff) | |
| parent | a67d425f4d5278595e7ab785a0f246b83fb1a09f (diff) | |
Merge https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/common/keyboard.c')
| -rw-r--r-- | tmk_core/common/keyboard.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index 302b3ec87c..1d99818481 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c @@ -27,7 +27,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "command.h" #include "util.h" #include "sendchar.h" -#include "bootmagic.h" +#ifdef BOOTMAGIC_ENABLE + #include "bootmagic.h" +#else + #include "magic.h" +#endif #include "eeconfig.h" #include "backlight.h" #ifdef MOUSEKEY_ENABLE @@ -86,6 +90,8 @@ void keyboard_init(void) #ifdef BOOTMAGIC_ENABLE bootmagic(); +#else + magic(); #endif #ifdef BACKLIGHT_ENABLE |