diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-04-27 12:34:54 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-04-27 12:34:54 -0400 |
| commit | f59c4b03facd80cab913c6612a899392dd42ebb8 (patch) | |
| tree | a6f0bcb584fcc6e6cc31261bafdc4f43b2fa7dfc /tmk_core/common/keyboard.c | |
| parent | 6ec6b613536b7138ee0c87002b10da8fe0c0117d (diff) | |
| parent | ce75a7675e10e24e7ecd7bc3575c0e0fc1bc34b5 (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 |