diff options
| author | Stephan Bösebeck <sb@caluga.de> | 2016-04-17 22:17:40 +0200 |
|---|---|---|
| committer | Stephan Bösebeck <sb@caluga.de> | 2016-04-17 22:17:40 +0200 |
| commit | 7c3345f9b9aeb44306d2fe5b640f3ee95868efeb (patch) | |
| tree | 874de8f8254513978d2c001b63b6a81c514f7706 /tmk_core/common/keyboard.c | |
| parent | 38a1d830faa138f6a7e094b3eda33dc528112ec7 (diff) | |
| parent | a67d425f4d5278595e7ab785a0f246b83fb1a09f (diff) | |
Merge branch 'master' of 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 |