diff options
| author | skullY <skullydazed@gmail.com> | 2019-01-27 17:34:44 -0800 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2019-02-10 15:37:12 -0800 |
| commit | c5221fa1cb1e903600205ba831c841f9d3aad33f (patch) | |
| tree | 488ada6355c4c193c5c4311fc4aab9f2e2b23471 | |
| parent | 5fc24218113a4c862a05a5e4c900cb1733ef75b7 (diff) | |
| download | qmk_firmware-c5221fa1cb1e903600205ba831c841f9d3aad33f.tar.gz qmk_firmware-c5221fa1cb1e903600205ba831c841f9d3aad33f.zip | |
fix the led_matrix.h naming conflict
| -rw-r--r-- | quantum/led_matrix.c | 2 | ||||
| -rw-r--r-- | quantum/led_matrix_drivers.c | 2 | ||||
| -rw-r--r-- | quantum/ledmatrix.h (renamed from quantum/led_matrix.h) | 0 | ||||
| -rw-r--r-- | quantum/quantum.h | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/quantum/led_matrix.c b/quantum/led_matrix.c index ca37af0d3..8ef8abe71 100644 --- a/quantum/led_matrix.c +++ b/quantum/led_matrix.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <stdint.h> | 20 | #include <stdint.h> |
| 21 | #include <stdbool.h> | 21 | #include <stdbool.h> |
| 22 | #include "quantum.h" | 22 | #include "quantum.h" |
| 23 | #include "led_matrix.h" | 23 | #include "ledmatrix.h" |
| 24 | #include "progmem.h" | 24 | #include "progmem.h" |
| 25 | #include "config.h" | 25 | #include "config.h" |
| 26 | #include "eeprom.h" | 26 | #include "eeprom.h" |
diff --git a/quantum/led_matrix_drivers.c b/quantum/led_matrix_drivers.c index aeb3bfd55..4ee509ee5 100644 --- a/quantum/led_matrix_drivers.c +++ b/quantum/led_matrix_drivers.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <stdint.h> | 18 | #include <stdint.h> |
| 19 | #include <stdbool.h> | 19 | #include <stdbool.h> |
| 20 | #include "quantum.h" | 20 | #include "quantum.h" |
| 21 | #include "led_matrix.h" | 21 | #include "ledmatrix.h" |
| 22 | 22 | ||
| 23 | /* Each driver needs to define a struct: | 23 | /* Each driver needs to define a struct: |
| 24 | * | 24 | * |
diff --git a/quantum/led_matrix.h b/quantum/ledmatrix.h index 618c5d676..618c5d676 100644 --- a/quantum/led_matrix.h +++ b/quantum/ledmatrix.h | |||
diff --git a/quantum/quantum.h b/quantum/quantum.h index 169883609..c6acf83e5 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | #include "keymap.h" | 29 | #include "keymap.h" |
| 30 | #ifdef BACKLIGHT_ENABLE | 30 | #ifdef BACKLIGHT_ENABLE |
| 31 | #ifdef LED_MATRIX_ENABLE | 31 | #ifdef LED_MATRIX_ENABLE |
| 32 | #include "led_matrix.h" | 32 | #include "ledmatrix.h" |
| 33 | #else | 33 | #else |
| 34 | #include "backlight.h" | 34 | #include "backlight.h" |
| 35 | #endif | 35 | #endif |