diff options
| author | skullY <skullydazed@gmail.com> | 2019-01-28 02:34:44 +0100 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2019-02-11 00:37:12 +0100 |
| commit | c5221fa1cb1e903600205ba831c841f9d3aad33f (patch) | |
| tree | 488ada6355c4c193c5c4311fc4aab9f2e2b23471 /quantum | |
| parent | 5fc24218113a4c862a05a5e4c900cb1733ef75b7 (diff) | |
| download | qmk_firmware-c5221fa1cb1e903600205ba831c841f9d3aad33f.tar.gz qmk_firmware-c5221fa1cb1e903600205ba831c841f9d3aad33f.tar.xz | |
fix the led_matrix.h naming conflict
Diffstat (limited to 'quantum')
| -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 @@ #include <stdint.h> #include <stdbool.h> #include "quantum.h" -#include "led_matrix.h" +#include "ledmatrix.h" #include "progmem.h" #include "config.h" #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 @@ #include <stdint.h> #include <stdbool.h> #include "quantum.h" -#include "led_matrix.h" +#include "ledmatrix.h" /* Each driver needs to define a struct: * 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 @@ #include "keymap.h" #ifdef BACKLIGHT_ENABLE #ifdef LED_MATRIX_ENABLE - #include "led_matrix.h" + #include "ledmatrix.h" #else #include "backlight.h" #endif |