summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskullY <skullydazed@gmail.com>2019-01-27 17:34:44 -0800
committerskullydazed <skullydazed@users.noreply.github.com>2019-02-10 15:37:12 -0800
commitc5221fa1cb1e903600205ba831c841f9d3aad33f (patch)
tree488ada6355c4c193c5c4311fc4aab9f2e2b23471
parent5fc24218113a4c862a05a5e4c900cb1733ef75b7 (diff)
fix the led_matrix.h naming conflict0.6.273
-rw-r--r--quantum/led_matrix.c2
-rw-r--r--quantum/led_matrix_drivers.c2
-rw-r--r--quantum/ledmatrix.h (renamed from quantum/led_matrix.h)0
-rw-r--r--quantum/quantum.h2
4 files changed, 3 insertions, 3 deletions
diff --git a/quantum/led_matrix.c b/quantum/led_matrix.c
index ca37af0d3d..8ef8abe712 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 aeb3bfd550..4ee509ee56 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 618c5d6767..618c5d6767 100644
--- a/quantum/led_matrix.h
+++ b/quantum/ledmatrix.h
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 1698836094..c6acf83e5a 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