summaryrefslogtreecommitdiffstats
path: root/tmk_core/common/keymap.h
diff options
context:
space:
mode:
authorNicholas Keene <git@nicholaskeene.com>2016-05-02 21:35:58 -0500
committerNicholas Keene <git@nicholaskeene.com>2016-05-02 21:35:58 -0500
commit8b0274f60a47eae523e28b5a7c6c7f581b6d605a (patch)
treeb8c6194d89712ddaf5e22aef85274c12c53cb2f1 /tmk_core/common/keymap.h
parent1076c2b1226ed049a364971bf8e1edcd9ed45f6d (diff)
parent2c070163ffffffde546fb00acaa2fbb96b93da64 (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/common/keymap.h')
-rw-r--r--tmk_core/common/keymap.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/tmk_core/common/keymap.h b/tmk_core/common/keymap.h
index e1a6f992e6..abc9bdb32d 100644
--- a/tmk_core/common/keymap.h
+++ b/tmk_core/common/keymap.h
@@ -22,8 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdbool.h>
#include "action.h"
-
-#ifdef BOOTMAGIC_ENABLE
/* NOTE: Not portable. Bit field order depends on implementation */
typedef union {
uint8_t raw;
@@ -39,7 +37,6 @@ typedef union {
};
} keymap_config_t;
keymap_config_t keymap_config;
-#endif
/* translates key to keycode */