7 files changed, 4 insertions(+), 3 deletions(-)

M builddefs/build_keyboard.mk
M tmk_core/protocol.mk
R tmk_core/protocol/{arm_atsam.mk => arm_atsam/arm_atsam.mk}
R tmk_core/protocol/{chibios.mk => chibios/chibios.mk}
R tmk_core/protocol/{lufa.mk => lufa/lufa.mk}
R tmk_core/protocol/{usb_hid.mk => usb_hid/usb_hid.mk}
R tmk_core/protocol/{vusb.mk => vusb/vusb.mk}

@@ 440,10 440,11 @@ include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
 -include $(PLATFORM_PATH)/$(PLATFORM_KEY)/flash.mk
 
 ifneq ($(strip $(PROTOCOL)),)
-    include $(TMK_PATH)/protocol/$(strip $(shell echo $(PROTOCOL) | tr '[:upper:]' '[:lower:]')).mk
+PROTOCOL_KEY = $(strip $(shell echo $(PROTOCOL) | tr '[:upper:]' '[:lower:]'))
 else
-    include $(TMK_PATH)/protocol/$(PLATFORM_KEY).mk
+PROTOCOL_KEY = $(PLATFORM_KEY)
 endif
+include $(TMK_PATH)/protocol/$(PROTOCOL_KEY)/$(PROTOCOL_KEY).mk
 
 # Setup definitions based on the selected MCU
 $(eval $(call add_qmk_prefix_defs,MCU_ORIG,MCU))

@@ 99,7 99,7 @@ ifeq ($(strip $(SHARED_EP_ENABLE)), yes)
 endif
 
 ifeq ($(strip $(USB_HID_ENABLE)), yes)
-    include $(TMK_DIR)/protocol/usb_hid.mk
+    include $(TMK_DIR)/protocol/usb_hid/usb_hid.mk
 endif
 
 # Search Path