Commit 41d9c644 authored by matt mooney's avatar matt mooney Committed by Michal Marek

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: default avatarmatt mooney <mfm@muteddisk.com>
Acked-by: default avatarWANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent f656c25b
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
# Makefile for the kernel MemoryStick device drivers. # Makefile for the kernel MemoryStick device drivers.
# #
ifeq ($(CONFIG_MEMSTICK_DEBUG),y) subdir-ccflags-$(CONFIG_MEMSTICK_DEBUG) := -DDEBUG
EXTRA_CFLAGS += -DDEBUG
endif
obj-$(CONFIG_MEMSTICK) += core/ obj-$(CONFIG_MEMSTICK) += core/
obj-$(CONFIG_MEMSTICK) += host/ obj-$(CONFIG_MEMSTICK) += host/
......
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
# Makefile for the kernel MemoryStick core. # Makefile for the kernel MemoryStick core.
# #
ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
EXTRA_CFLAGS += -DDEBUG
endif
obj-$(CONFIG_MEMSTICK) += memstick.o obj-$(CONFIG_MEMSTICK) += memstick.o
obj-$(CONFIG_MSPRO_BLOCK) += mspro_block.o obj-$(CONFIG_MSPRO_BLOCK) += mspro_block.o
...@@ -2,9 +2,5 @@ ...@@ -2,9 +2,5 @@
# Makefile for MemoryStick host controller drivers # 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_TIFM_MS) += tifm_ms.o
obj-$(CONFIG_MEMSTICK_JMICRON_38X) += jmb38x_ms.o obj-$(CONFIG_MEMSTICK_JMICRON_38X) += jmb38x_ms.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment