diff --git a/[refs] b/[refs]
index e8bad42e5fb4..ba8acde0f1e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51a1efe2e84493439db32c07471e835c752a7923
+refs/heads/master: 87e51107323a84e26a5004337217fc954e8d9545
diff --git a/trunk/drivers/dma/Makefile b/trunk/drivers/dma/Makefile
index a8a84f4587f2..64b21f5cd740 100644
--- a/trunk/drivers/dma/Makefile
+++ b/trunk/drivers/dma/Makefile
@@ -1,8 +1,8 @@
 ifeq ($(CONFIG_DMADEVICES_DEBUG),y)
-	EXTRA_CFLAGS	+= -DDEBUG
+	ccflags-y	+= -DDEBUG
 endif
 ifeq ($(CONFIG_DMADEVICES_VDEBUG),y)
-	EXTRA_CFLAGS	+= -DVERBOSE_DEBUG
+	ccflags-y	+= -DVERBOSE_DEBUG
 endif
 
 obj-$(CONFIG_DMA_ENGINE) += dmaengine.o