Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41d9c644 authored Jan 14, 2011 by matt mooney Committed by Michal Marek Mar 17, 2011

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>

parent f656c25b

drivers/memstick/Makefile

+1 −3

Original line number	Diff line number	Diff line
		@@ -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/

drivers/memstick/core/Makefile

+0 −4

Original line number	Diff line number	Diff line
		@@ -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

drivers/memstick/host/Makefile

+0 −4

Original line number	Diff line number	Diff line
		@@ -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