From d3c502b84f734b36abdc9d11ec61f00016e98d33 Mon Sep 17 00:00:00 2001 From: matt mooney Date: Fri, 24 Sep 2010 12:17:24 -0700 Subject: [PATCH] mmc: Makefile: Fix EXTRA_CFLAGS assignment The EXTRA_CFLAGS assignment in mmc/Makefile was not accomplishing anything because this flag only has effect on sources at the same level as the makefile (i.e., per directory). Since card/, core/, and host/ rely on MMC_DEBUG, the subdir-ccflags-y variant seems to be the appropriate choice. Signed-off-by: matt mooney Signed-off-by: Chris Ball --- drivers/mmc/Makefile | 4 +--- drivers/mmc/card/Makefile | 4 ---- drivers/mmc/core/Makefile | 4 ---- drivers/mmc/host/Makefile | 4 ---- 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 9979f5e9765..12eef393e21 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -2,9 +2,7 @@ # Makefile for the kernel mmc device drivers. # -ifeq ($(CONFIG_MMC_DEBUG),y) - EXTRA_CFLAGS += -DDEBUG -endif +subdir-ccflags-$(CONFIG_MMC_DEBUG) := -DDEBUG obj-$(CONFIG_MMC) += core/ obj-$(CONFIG_MMC) += card/ diff --git a/drivers/mmc/card/Makefile b/drivers/mmc/card/Makefile index 0d407514f67..c73b406a06c 100644 --- a/drivers/mmc/card/Makefile +++ b/drivers/mmc/card/Makefile @@ -2,10 +2,6 @@ # Makefile for MMC/SD card drivers # -ifeq ($(CONFIG_MMC_DEBUG),y) - EXTRA_CFLAGS += -DDEBUG -endif - obj-$(CONFIG_MMC_BLOCK) += mmc_block.o mmc_block-objs := block.o queue.o obj-$(CONFIG_MMC_TEST) += mmc_test.o diff --git a/drivers/mmc/core/Makefile b/drivers/mmc/core/Makefile index 889e5f898f6..86b47911933 100644 --- a/drivers/mmc/core/Makefile +++ b/drivers/mmc/core/Makefile @@ -2,10 +2,6 @@ # Makefile for the kernel mmc core. # -ifeq ($(CONFIG_MMC_DEBUG),y) - EXTRA_CFLAGS += -DDEBUG -endif - obj-$(CONFIG_MMC) += mmc_core.o mmc_core-y := core.o bus.o host.o \ mmc.o mmc_ops.o sd.o sd_ops.o \ diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index f7fb7eb234b..eae5d62711f 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -2,10 +2,6 @@ # Makefile for MMC/SD host controller drivers # -ifeq ($(CONFIG_MMC_DEBUG),y) - EXTRA_CFLAGS += -DDEBUG -endif - obj-$(CONFIG_MMC_ARMMMCI) += mmci.o obj-$(CONFIG_MMC_PXA) += pxamci.o obj-$(CONFIG_MMC_IMX) += imxmmc.o -- 2.20.1