aboutsummaryrefslogtreecommitdiff
path: root/drivers/memstick
diff options
context:
space:
mode:
authormatt mooney <mfm@muteddisk.com>2011-01-14 06:12:42 -0800
committerMichal Marek <mmarek@suse.cz>2011-03-17 14:05:34 +0100
commit41d9c644fc4dd5fa399682c0f8d0d1f79b77a199 (patch)
tree45ce8fc5f1db2948c6fa94c7f9ca006a7ba55811 /drivers/memstick
parentf656c25b71b986b98dce2f8d268524f792b7e43f (diff)
downloadvexpress-lsk-41d9c644fc4dd5fa399682c0f8d0d1f79b77a199.tar.gz
memstick: change to new flag variable
The EXTRA_CFLAGS assignment in memstick/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 both core/ and host/ rely on MEMSTICK_DEBUG, the subdir-ccflags-y variant seems to be the appropriate choice. Signed-off-by: matt mooney <mfm@muteddisk.com> Acked-by: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'drivers/memstick')
-rw-r--r--drivers/memstick/Makefile4
-rw-r--r--drivers/memstick/core/Makefile4
-rw-r--r--drivers/memstick/host/Makefile4
3 files changed, 1 insertions, 11 deletions
diff --git a/drivers/memstick/Makefile b/drivers/memstick/Makefile
index dc160fb4351..98623590c7f 100644
--- a/drivers/memstick/Makefile
+++ b/drivers/memstick/Makefile
@@ -2,9 +2,7 @@
# Makefile for the kernel MemoryStick device drivers.
#
-ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
+subdir-ccflags-$(CONFIG_MEMSTICK_DEBUG) := -DDEBUG
obj-$(CONFIG_MEMSTICK) += core/
obj-$(CONFIG_MEMSTICK) += host/
diff --git a/drivers/memstick/core/Makefile b/drivers/memstick/core/Makefile
index 8b2b5293877..ecd02993773 100644
--- a/drivers/memstick/core/Makefile
+++ b/drivers/memstick/core/Makefile
@@ -2,10 +2,6 @@
# Makefile for the kernel MemoryStick core.
#
-ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
-
obj-$(CONFIG_MEMSTICK) += memstick.o
obj-$(CONFIG_MSPRO_BLOCK) += mspro_block.o
diff --git a/drivers/memstick/host/Makefile b/drivers/memstick/host/Makefile
index 12530e4311d..a1815e9dd01 100644
--- a/drivers/memstick/host/Makefile
+++ b/drivers/memstick/host/Makefile
@@ -2,9 +2,5 @@
# Makefile for MemoryStick host controller drivers
#
-ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
-endif
-
obj-$(CONFIG_MEMSTICK_TIFM_MS) += tifm_ms.o
obj-$(CONFIG_MEMSTICK_JMICRON_38X) += jmb38x_ms.o