diff options
| author | tmk <nobody@nowhere> | 2013-02-16 04:20:01 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-02-16 04:20:01 +0900 |
| commit | 998dc6c17e0b0cfe8377529a130d9c61590caf2a (patch) | |
| tree | f0745fb55e970f057a862732739be4a665cdf910 /keyboard/gh60/keymap.c | |
| parent | f8d289e66965f99469292370c3b9200a03254f8e (diff) | |
| parent | 06e4fc66edd15efa5afdcaed2102c7698b626484 (diff) | |
| download | firmware-998dc6c17e0b0cfe8377529a130d9c61590caf2a.tar.gz firmware-998dc6c17e0b0cfe8377529a130d9c61590caf2a.tar.bz2 firmware-998dc6c17e0b0cfe8377529a130d9c61590caf2a.zip | |
Merge branch 'layer_switch'
Diffstat (limited to 'keyboard/gh60/keymap.c')
| -rw-r--r-- | keyboard/gh60/keymap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/keyboard/gh60/keymap.c b/keyboard/gh60/keymap.c index 9438782f2..8739aa163 100644 --- a/keyboard/gh60/keymap.c +++ b/keyboard/gh60/keymap.c @@ -64,8 +64,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "keymap_plain.h" #elif defined(KEYMAP_POKER) #include "keymap_poker.h" -#elif defined(KEYMAP_POKER_STACK) - #include "keymap_poker_stack.h" +#elif defined(KEYMAP_POKER_SET) + #include "keymap_poker_set.h" +#elif defined(KEYMAP_POKER_BIT) + #include "keymap_poker_bit.h" #else static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* |