Skip to content

Commit

Permalink
memstick: change to new flag variable
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
matt mooney authored and Michal Marek committed Mar 17, 2011
1 parent f656c25 commit 41d9c64
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
4 changes: 1 addition & 3 deletions drivers/memstick/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
4 changes: 0 additions & 4 deletions drivers/memstick/core/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions drivers/memstick/host/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 41d9c64

Please sign in to comment.