Merge remote-tracking branch 'origin/master' into develop

1 files changed, 2 insertions, 4 deletions

diff --git a/keyboards/preonic/keymaps/zach/rules.mk b/keyboards/preonic/keymaps/zach/rules.mk
index 8d2f75eea..8cd4f98ee 100644
--- a/keyboards/preonic/keymaps/zach/rules.mk
+++ b/keyboards/preonic/keymaps/zach/rules.mk
@@ -2,7 +2,7 @@
 # Max .hex size is about 28636 bytes
 
 # Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
+#   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
 TAP_DANCE_ENABLE    = yes   # Enable TapDance functionality
@@ -12,7 +12,6 @@ EXTRAKEY_ENABLE     = no    # Audio control and System control(+450)
 CONSOLE_ENABLE      = no    # Console for debug(+400)
 COMMAND_ENABLE      = no    # Commands for debug and configuration
 NKRO_ENABLE         = yes   # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-USB_6KRO_ENABLE     = no    # 6key Rollover
 BACKLIGHT_ENABLE    = yes   # Enable keyboard backlight functionality
 MIDI_ENABLE         = no    # MIDI controls
 AUDIO_ENABLE        = yes   # Audio output on port C6
@@ -20,7 +19,6 @@ AUDIO_ENABLE        = yes   # Audio output on port C6
 UNICODE_ENABLE      = no    # Unicode
 UNICODEMAP_ENABLE   = yes   # Enable extended unicode
 BLUETOOTH_ENABLE    = no    # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE     = no    # Enable WS2812 RGB underlight. 
+RGBLIGHT_ENABLE     = no    # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE    = no    # Breathing sleep LED during USB suspend
-