Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

matt mooney and committed by
Michal Marek
41d9c644 f656c25b

+1 -11
+1 -3
drivers/memstick/Makefile
··· 2 2 # Makefile for the kernel MemoryStick device drivers. 3 3 # 4 4 5 - ifeq ($(CONFIG_MEMSTICK_DEBUG),y) 6 - EXTRA_CFLAGS += -DDEBUG 7 - endif 5 + subdir-ccflags-$(CONFIG_MEMSTICK_DEBUG) := -DDEBUG 8 6 9 7 obj-$(CONFIG_MEMSTICK) += core/ 10 8 obj-$(CONFIG_MEMSTICK) += host/
-4
drivers/memstick/core/Makefile
··· 2 2 # Makefile for the kernel MemoryStick core. 3 3 # 4 4 5 - ifeq ($(CONFIG_MEMSTICK_DEBUG),y) 6 - EXTRA_CFLAGS += -DDEBUG 7 - endif 8 - 9 5 obj-$(CONFIG_MEMSTICK) += memstick.o 10 6 11 7 obj-$(CONFIG_MSPRO_BLOCK) += mspro_block.o
-4
drivers/memstick/host/Makefile
··· 2 2 # Makefile for MemoryStick host controller drivers 3 3 # 4 4 5 - ifeq ($(CONFIG_MEMSTICK_DEBUG),y) 6 - EXTRA_CFLAGS += -DDEBUG 7 - endif 8 - 9 5 obj-$(CONFIG_MEMSTICK_TIFM_MS) += tifm_ms.o 10 6 obj-$(CONFIG_MEMSTICK_JMICRON_38X) += jmb38x_ms.o