Merge pull request #219 from IBNobody/master

Master

tmk_core/common/avr/suspend.c

@@ -66,9 +66,12 @@ static void power_down(uint8_t wdto)
     wdt_intr_enable(wdto);
 
 #ifdef BACKLIGHT_ENABLE
-backlight_set(0);
+	backlight_set(0);
 #endif
 
+	// Turn off LED indicators
+	led_set(0);
+
     // TODO: more power saving
     // See PicoPower application note
     // - I/O port input with pullup

tmk_core/common/keyboard.c

@@ -92,7 +92,7 @@ void keyboard_init(void)
     backlight_init();
 #endif
 
-#ifdef FORCE_NKRO
+#if defined(NKRO_ENABLE) && defined(FORCE_NKRO)
 	keyboard_nkro = true;
 #endif