From: flabbergast <s3+flabbergast@sdfeu.org>
Date: Mon, 18 Jan 2016 07:36:39 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/master' into chibios
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=b1b30f167587349acbb7dc4f286a8742b8b63d00;p=max%2Ftmk_keyboard.git

Merge remote-tracking branch 'upstream/master' into chibios
---

b1b30f167587349acbb7dc4f286a8742b8b63d00
diff --cc tmk_core/common.mk
index 159183a2,3b53c0a0..8e6ba561
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@@ -53,8 -53,12 +53,12 @@@ ifdef USB_6KRO_ENABL
      OPT_DEFS += -DUSB_6KRO_ENABLE
  endif
  
+ ifdef KEYBOARD_LOCK_ENABLE
+     OPT_DEFS += -DKEYBOARD_LOCK_ENABLE
+ endif
+ 
  ifdef SLEEP_LED_ENABLE
 -    SRC += $(COMMON_DIR)/sleep_led.c
 +    SRC += $(COMMON_DIR)/avr/sleep_led.c
      OPT_DEFS += -DSLEEP_LED_ENABLE
      OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
  endif