diff options
| author | IBNobody <protospherex@gmail.com> | 2016-04-18 15:47:10 -0500 |
|---|---|---|
| committer | IBNobody <protospherex@gmail.com> | 2016-04-18 15:47:10 -0500 |
| commit | cbcf0abe62b764a9f3d80848611dca8291d93eb8 (patch) | |
| tree | 2014b1d839bfaa29acdbf432265d908562304834 /tmk_core/common/keyboard.c | |
| parent | d5cc31d7d4fc1a36fc3e3e0018369cb52553f50f (diff) | |
| parent | 4f4b5b8c18d4f1bf4fd4c51ad6f316501dfbd6cc (diff) | |
Merge remote-tracking branch 'refs/remotes/origin/personal_atomic_planck'
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 |