3 files changed, 10 insertions, 1 deletions

diff --git a/common.mk b/common.mk
index 2ce4e32da..e4c9fb269 100644
--- a/common.mk
+++ b/common.mk
@@ -5,7 +5,6 @@ SRC +=	$(COMMON_DIR)/host.c \
         $(COMMON_DIR)/action_macro.c \
         $(COMMON_DIR)/layer_switch.c \
         $(COMMON_DIR)/keymap.c \
-        $(COMMON_DIR)/command.c \
         $(COMMON_DIR)/timer.c \
         $(COMMON_DIR)/print.c \
         $(COMMON_DIR)/debug.c \
@@ -36,6 +35,11 @@ else
     OPT_DEFS += -DNO_DEBUG
 endif
 
+ifdef COMMAND_ENABLE
+    SRC += $(COMMON_DIR)/command.c
+    OPT_DEFS += -DCOMMAND_ENABLE
+endif
+
 ifdef NKRO_ENABLE
     OPT_DEFS += -DNKRO_ENABLE
 endif
diff --git a/common/command.h b/common/command.h
index dafd4d0f3..be739fafe 100644
--- a/common/command.h
+++ b/common/command.h
@@ -18,8 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef COMMAND_H
 #define COMMAND
 
+#ifdef COMMAND_ENABLE
 bool command_proc(uint8_t code);
 /* This allows to extend commands. Return 0 when command is not processed. */
 bool command_extra(uint8_t code);
+#else
+#define command_proc(code)      false
+#endif
 
 #endif
diff --git a/keyboard/gh60/Makefile.lufa b/keyboard/gh60/Makefile.lufa
index 8042ff3f4..f740dea84 100644
--- a/keyboard/gh60/Makefile.lufa
+++ b/keyboard/gh60/Makefile.lufa
@@ -103,6 +103,7 @@ BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes   # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes   # Audio control and System control(+450)
 CONSOLE_ENABLE = yes    # Console for debug(+400)
+COMMAND_ENABLE = yes    # Magic command
 SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 #NKRO_ENABLE = yes      # USB Nkey Rollover - not yet supported in LUFA
 #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support