aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox/ez/rules.mk
diff options
context:
space:
mode:
authorjpetermans <tibcmhhm@gmail.com>2017-05-24 11:51:20 -0700
committerjpetermans <tibcmhhm@gmail.com>2017-05-24 11:51:20 -0700
commit2dcd6c38fa478b40a973c9411c3f5b4c87ae0ba7 (patch)
tree289d5cce94ad5883741f0b637749d87680c14d33 /keyboards/ergodox/ez/rules.mk
parentd89114400c398b900e27bf324a7973d1e0f25e58 (diff)
parent7a4ec3bd926865e490fbf7c5ec68d762e998683f (diff)
downloadfirmware-2dcd6c38fa478b40a973c9411c3f5b4c87ae0ba7.tar.gz
firmware-2dcd6c38fa478b40a973c9411c3f5b4c87ae0ba7.tar.bz2
firmware-2dcd6c38fa478b40a973c9411c3f5b4c87ae0ba7.zip
Merge remote-tracking branch 'upstream/master' into infinity60
Diffstat (limited to 'keyboards/ergodox/ez/rules.mk')
-rw-r--r--keyboards/ergodox/ez/rules.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/keyboards/ergodox/ez/rules.mk b/keyboards/ergodox/ez/rules.mk
index 64b2db815..6cd1c0c4f 100644
--- a/keyboards/ergodox/ez/rules.mk
+++ b/keyboards/ergodox/ez/rules.mk
@@ -74,7 +74,3 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512
SLEEP_LED_ENABLE = no
API_SYSEX_ENABLE ?= no
RGBLIGHT_ENABLE ?= yes
-
-ifndef QUANTUM_DIR
- include ../../../Makefile
-endif