summaryrefslogtreecommitdiff
path: root/quantum/keymap_extras/keymap_german_ch.h
diff options
context:
space:
mode:
authorDamien2017-04-29 15:03:52 +0200
committerGitHub2017-04-29 15:03:52 +0200
commit584b804ee33d53102fef3b8cdd045bca4c47bf26 (patch)
treecccdc512fed02293ffd0bfb962ec14d8a8664e7f /quantum/keymap_extras/keymap_german_ch.h
parent215dd126d08b29939c53bf0eaa006ce6ecdedb83 (diff)
parent26bbfd78125224abdbd2e4ccf3aa3df1b5fc4968 (diff)
Merge pull request #21 from qmk/master
Merge from QMK
Diffstat (limited to 'quantum/keymap_extras/keymap_german_ch.h')
-rw-r--r--quantum/keymap_extras/keymap_german_ch.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/quantum/keymap_extras/keymap_german_ch.h b/quantum/keymap_extras/keymap_german_ch.h
index 8332e00af..67350d660 100644
--- a/quantum/keymap_extras/keymap_german_ch.h
+++ b/quantum/keymap_extras/keymap_german_ch.h
@@ -33,6 +33,10 @@
#define CH_E KC_E
#define CH_F KC_F
#define CH_G KC_G
+#ifdef CH_H
+// The ChibiOS ch.h file defines this...
+#undef CH_H
+#endif
#define CH_H KC_H
#define CH_I KC_I
#define CH_J KC_J