X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=quantum%2Fkeymap.h;h=bfcb2f7cd517d861c032951f351da510c399c8f5;hb=38fdf7a2d2f3f0bb9c21332b81a289de94b9870a;hp=c000d2da8ee4cd5b49d73939b315dcfd4332b7f6;hpb=a896b300ec21c334b4806551ef9052b06839d1ba;p=qmk_firmware.git

diff --git a/quantum/keymap.h b/quantum/keymap.h
index c000d2da8..bfcb2f7cd 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+Copyright 2012-2016 Jun Wako <wakojun@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -23,6 +23,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "action.h"
 #if defined(__AVR__)
 #include <avr/pgmspace.h>
+#elif defined PROTOCOL_CHIBIOS
+//We need to ensure that chibios is include before redefining reset
+#include "ch.h"
 #endif
 #include "keycode.h"
 #include "action_macro.h"