diff --git a/[refs] b/[refs]
index 737d306aff5c..31d9d54e2973 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54e2c96ed5009a08e490a2a8b1ed2d322305a2da
+refs/heads/master: 6236709aceac4f7ceab3b3ec65bf94c584287fef
diff --git a/trunk/drivers/staging/usbip/Makefile b/trunk/drivers/staging/usbip/Makefile
index 6f2916b1807a..10307f8a8259 100644
--- a/trunk/drivers/staging/usbip/Makefile
+++ b/trunk/drivers/staging/usbip/Makefile
@@ -7,6 +7,5 @@ vhci-hcd-objs := vhci_sysfs.o vhci_tx.o vhci_rx.o vhci_hcd.o
 obj-$(CONFIG_USB_IP_HOST) += usbip.o
 usbip-objs := stub_dev.o stub_main.o stub_rx.o stub_tx.o
 
-ifeq ($(CONFIG_USB_IP_DEBUG_ENABLE),y)
-	EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_USB_IP_DEBUG_ENABLE) := -DDEBUG
+