aboutsummaryrefslogtreecommitdiffstats
path: root/common/keyboard.c
diff options
context:
space:
mode:
authorGravatar tmk <nobody@nowhere>2013-03-11 15:28:14 +0900
committerGravatar tmk <nobody@nowhere>2013-03-11 15:28:46 +0900
commitef8439bddb2d7fe5fd95faf2b6bebd8235acf160 (patch)
tree4af03a20658cb7e6cd43f9c65dfa002f1b544332 /common/keyboard.c
parentd055e0633e36e97802d60554f6002e47021ba5fd (diff)
downloadqmk_firmware-ef8439bddb2d7fe5fd95faf2b6bebd8235acf160.tar.gz
Add build option BOOTMAGIC_ENABLE
Diffstat (limited to 'common/keyboard.c')
-rw-r--r--common/keyboard.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/keyboard.c b/common/keyboard.c
index 1acb79861..401fdb4e1 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -29,10 +29,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "util.h"
#include "sendchar.h"
#include "bootmagic.h"
-#ifdef MOUSEKEY_ENABLE
-#include "mousekey.h"
-#endif
#include "eeconfig.h"
+#include "mousekey.h"
#ifdef MATRIX_HAS_GHOST
@@ -64,6 +62,7 @@ void keyboard_init(void)
ps2_mouse_init();
#endif
+#ifdef BOOTMAGIC_ENABLE
bootmagic();
if (eeconfig_is_enabled()) {
@@ -77,6 +76,7 @@ void keyboard_init(void)
} else {
eeconfig_init();
}
+#endif
}
/*