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

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
video: change to new flag variable
scsi: change to new flag variable
rtc: change to new flag variable
rapidio: change to new flag variable
pps: change to new flag variable
net: change to new flag variable
misc: change to new flag variable
message: change to new flag variable
memstick: change to new flag variable
isdn: change to new flag variable
ieee802154: change to new flag variable
ide: change to new flag variable
hwmon: change to new flag variable
dma: change to new flag variable
char: change to new flag variable
fs: change to new flag variable
xtensa: change to new flag variable
um: change to new flag variables
s390: change to new flag variable
mips: change to new flag variable
...

Fix up trivial conflict in drivers/hwmon/Makefile

Linus Torvalds a44f99c7 b87a2d3e

+84 -136
unified split
+2 -2
arch/arm/boot/compressed/Makefile
··· 95 KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) 96 endif 97 98 - EXTRA_CFLAGS := -fpic -fno-builtin 99 - EXTRA_AFLAGS := -Wa,-march=all 100 101 # Provide size of uncompressed kernel to the decompressor via a linker symbol. 102 LDFLAGS_vmlinux = --defsym _image_size=$(shell stat -c "%s" $(obj)/../Image)
··· 95 KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) 96 endif 97 98 + ccflags-y := -fpic -fno-builtin 99 + asflags-y := -Wa,-march=all 100 101 # Provide size of uncompressed kernel to the decompressor via a linker symbol. 102 LDFLAGS_vmlinux = --defsym _image_size=$(shell stat -c "%s" $(obj)/../Image)
+2 -2
arch/arm/vfp/Makefile
··· 4 # Copyright (C) 2001 ARM Limited 5 # 6 7 - # EXTRA_CFLAGS := -DDEBUG 8 - # EXTRA_AFLAGS := -DDEBUG 9 10 KBUILD_AFLAGS :=$(KBUILD_AFLAGS:-msoft-float=-Wa,-mfpu=softvfp+vfp) 11 LDFLAGS +=--no-warn-mismatch
··· 4 # Copyright (C) 2001 ARM Limited 5 # 6 7 + # ccflags-y := -DDEBUG 8 + # asflags-y := -DDEBUG 9 10 KBUILD_AFLAGS :=$(KBUILD_AFLAGS:-msoft-float=-Wa,-mfpu=softvfp+vfp) 11 LDFLAGS +=--no-warn-mismatch
+1 -1
arch/h8300/boot/compressed/Makefile
··· 5 # 6 7 targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o 8 - EXTRA_AFLAGS := -traditional 9 10 OBJECTS = $(obj)/head.o $(obj)/misc.o 11
··· 5 # 6 7 targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o 8 + asflags-y := -traditional 9 10 OBJECTS = $(obj)/head.o $(obj)/misc.o 11
+2 -2
arch/ia64/kvm/Makefile
··· 45 # Makefile for Kernel-based Virtual Machine module 46 # 47 48 - EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/ 49 - EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/ 50 51 common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \ 52 coalesced_mmio.o irq_comm.o assigned-dev.o)
··· 45 # Makefile for Kernel-based Virtual Machine module 46 # 47 48 + ccflags-y := -Ivirt/kvm -Iarch/ia64/kvm/ 49 + asflags-y := -Ivirt/kvm -Iarch/ia64/kvm/ 50 51 common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \ 52 coalesced_mmio.o irq_comm.o assigned-dev.o)
+1 -1
arch/ia64/sn/kernel/Makefile
··· 7 # Copyright (C) 1999,2001-2006,2008 Silicon Graphics, Inc. All Rights Reserved. 8 # 9 10 - EXTRA_CFLAGS += -Iarch/ia64/sn/include 11 12 obj-y += setup.o bte.o bte_error.o irq.o mca.o idle.o \ 13 huberror.o io_acpi_init.o io_common.o \
··· 7 # Copyright (C) 1999,2001-2006,2008 Silicon Graphics, Inc. All Rights Reserved. 8 # 9 10 + ccflags-y := -Iarch/ia64/sn/include 11 12 obj-y += setup.o bte.o bte_error.o irq.o mca.o idle.o \ 13 huberror.o io_acpi_init.o io_common.o \
+1 -1
arch/ia64/sn/kernel/sn2/Makefile
··· 9 # sn2 specific kernel files 10 # 11 12 - EXTRA_CFLAGS += -Iarch/ia64/sn/include 13 14 obj-y += cache.o io.o ptc_deadlock.o sn2_smp.o sn_proc_fs.o \ 15 prominfo_proc.o timer.o timer_interrupt.o sn_hwperf.o
··· 9 # sn2 specific kernel files 10 # 11 12 + ccflags-y := -Iarch/ia64/sn/include 13 14 obj-y += cache.o io.o ptc_deadlock.o sn2_smp.o sn_proc_fs.o \ 15 prominfo_proc.o timer.o timer_interrupt.o sn_hwperf.o
+1 -1
arch/ia64/sn/pci/Makefile
··· 7 # 8 # Makefile for the sn pci general routines. 9 10 - EXTRA_CFLAGS += -Iarch/ia64/sn/include 11 12 obj-y := pci_dma.o tioca_provider.o tioce_provider.o pcibr/
··· 7 # 8 # Makefile for the sn pci general routines. 9 10 + ccflags-y := -Iarch/ia64/sn/include 11 12 obj-y := pci_dma.o tioca_provider.o tioce_provider.o pcibr/
+1 -1
arch/ia64/sn/pci/pcibr/Makefile
··· 7 # 8 # Makefile for the sn2 io routines. 9 10 - EXTRA_CFLAGS += -Iarch/ia64/sn/include 11 12 obj-y += pcibr_dma.o pcibr_reg.o \ 13 pcibr_ate.o pcibr_provider.o
··· 7 # 8 # Makefile for the sn2 io routines. 9 10 + ccflags-y := -Iarch/ia64/sn/include 11 12 obj-y += pcibr_dma.o pcibr_reg.o \ 13 pcibr_ate.o pcibr_provider.o
+1 -1
arch/ia64/uv/kernel/Makefile
··· 7 # Copyright (C) 2008 Silicon Graphics, Inc. All Rights Reserved. 8 # 9 10 - EXTRA_CFLAGS += -Iarch/ia64/sn/include 11 12 obj-y += setup.o 13 obj-$(CONFIG_IA64_GENERIC) += machvec.o
··· 7 # Copyright (C) 2008 Silicon Graphics, Inc. All Rights Reserved. 8 # 9 10 + ccflags-y := -Iarch/ia64/sn/include 11 12 obj-y += setup.o 13 obj-$(CONFIG_IA64_GENERIC) += machvec.o
+1 -1
arch/microblaze/kernel/cpu/Makefile
··· 6 CFLAGS_REMOVE_cache.o = -pg 7 endif 8 9 - EXTRA_CFLAGS += -DCPU_MAJOR=$(CPU_MAJOR) -DCPU_MINOR=$(CPU_MINOR) \ 10 -DCPU_REV=$(CPU_REV) 11 12 obj-y += cache.o cpuinfo.o cpuinfo-pvr-full.o cpuinfo-static.o mb.o pvr.o
··· 6 CFLAGS_REMOVE_cache.o = -pg 7 endif 8 9 + ccflags-y := -DCPU_MAJOR=$(CPU_MAJOR) -DCPU_MINOR=$(CPU_MINOR) \ 10 -DCPU_REV=$(CPU_REV) 11 12 obj-y += cache.o cpuinfo.o cpuinfo-pvr-full.o cpuinfo-static.o mb.o pvr.o
+2 -2
arch/mips/Makefile
··· 286 archprepare: 287 ifdef CONFIG_MIPS32_N32 288 @echo ' Checking missing-syscalls for N32' 289 - $(Q)$(MAKE) $(build)=. missing-syscalls EXTRA_CFLAGS="-mabi=n32" 290 endif 291 ifdef CONFIG_MIPS32_O32 292 @echo ' Checking missing-syscalls for O32' 293 - $(Q)$(MAKE) $(build)=. missing-syscalls EXTRA_CFLAGS="-mabi=32" 294 endif 295 296 install:
··· 286 archprepare: 287 ifdef CONFIG_MIPS32_N32 288 @echo ' Checking missing-syscalls for N32' 289 + $(Q)$(MAKE) $(build)=. missing-syscalls ccflags-y="-mabi=n32" 290 endif 291 ifdef CONFIG_MIPS32_O32 292 @echo ' Checking missing-syscalls for O32' 293 + $(Q)$(MAKE) $(build)=. missing-syscalls ccflags-y="-mabi=32" 294 endif 295 296 install:
+1 -1
arch/mips/bcm63xx/boards/Makefile
··· 1 obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o 2 3 - EXTRA_CFLAGS += -Werror
··· 1 obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o 2 3 + ccflags-y := -Werror
+1 -1
arch/mips/fw/arc/Makefile
··· 9 lib-$(CONFIG_ARC_CONSOLE) += arc_con.o 10 lib-$(CONFIG_ARC_PROMLIB) += promlib.o 11 12 - EXTRA_CFLAGS += -Werror
··· 9 lib-$(CONFIG_ARC_CONSOLE) += arc_con.o 10 lib-$(CONFIG_ARC_PROMLIB) += promlib.o 11 12 + ccflags-y := -Werror
+1 -1
arch/mips/jz4740/Makefile
··· 17 18 obj-$(CONFIG_PM) += pm.o 19 20 - EXTRA_CFLAGS += -Werror -Wall
··· 17 18 obj-$(CONFIG_PM) += pm.o 19 20 + ccflags-y := -Werror -Wall
+1 -1
arch/mips/oprofile/Makefile
··· 1 - EXTRA_CFLAGS := -Werror 2 3 obj-$(CONFIG_OPROFILE) += oprofile.o 4
··· 1 + ccflags-y := -Werror 2 3 obj-$(CONFIG_OPROFILE) += oprofile.o 4
+1 -1
arch/mips/pmc-sierra/yosemite/Makefile
··· 6 7 obj-$(CONFIG_SMP) += smp.o 8 9 - EXTRA_CFLAGS += -Werror
··· 6 7 obj-$(CONFIG_SMP) += smp.o 8 9 + ccflags-y := -Werror
+1 -1
arch/mips/powertv/Makefile
··· 28 29 obj-$(CONFIG_USB) += powertv-usb.o 30 31 - EXTRA_CFLAGS += -Wall
··· 28 29 obj-$(CONFIG_USB) += powertv-usb.o 30 31 + ccflags-y := -Wall
+1 -1
arch/mips/powertv/asic/Makefile
··· 20 asic_devices.o asic_int.o irq_asic.o prealloc-calliope.o \ 21 prealloc-cronus.o prealloc-cronuslite.o prealloc-gaia.o prealloc-zeus.o 22 23 - EXTRA_CFLAGS += -Wall -Werror
··· 20 asic_devices.o asic_int.o irq_asic.o prealloc-calliope.o \ 21 prealloc-cronus.o prealloc-cronuslite.o prealloc-gaia.o prealloc-zeus.o 22 23 + ccflags-y := -Wall -Werror
+1 -1
arch/mips/powertv/pci/Makefile
··· 18 19 obj-$(CONFIG_PCI) += fixup-powertv.o 20 21 - EXTRA_CFLAGS += -Wall -Werror
··· 18 19 obj-$(CONFIG_PCI) += fixup-powertv.o 20 21 + ccflags-y := -Wall -Werror
+1 -1
arch/s390/boot/Makefile
··· 6 tr -c '[0-9A-Za-z]' '_'`__`date | \ 7 tr -c '[0-9A-Za-z]' '_'`_t 8 9 - EXTRA_CFLAGS := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I. 10 11 targets := image 12 targets += bzImage
··· 6 tr -c '[0-9A-Za-z]' '_'`__`date | \ 7 tr -c '[0-9A-Za-z]' '_'`_t 8 9 + ccflags-y := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I. 10 11 targets := image 12 targets += bzImage
+1 -1
arch/s390/kvm/Makefile
··· 8 9 common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o) 10 11 - EXTRA_CFLAGS += -Ivirt/kvm -Iarch/s390/kvm 12 13 kvm-objs := $(common-objs) kvm-s390.o sie64a.o intercept.o interrupt.o priv.o sigp.o diag.o 14 obj-$(CONFIG_KVM) += kvm.o
··· 8 9 common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o) 10 11 + ccflags-y := -Ivirt/kvm -Iarch/s390/kvm 12 13 kvm-objs := $(common-objs) kvm-s390.o sie64a.o intercept.o interrupt.o priv.o sigp.o diag.o 14 obj-$(CONFIG_KVM) += kvm.o
+1 -1
arch/s390/math-emu/Makefile
··· 4 5 obj-$(CONFIG_MATHEMU) := math.o 6 7 - EXTRA_CFLAGS := -I$(src) -Iinclude/math-emu -w
··· 4 5 obj-$(CONFIG_MATHEMU) := math.o 6 7 + ccflags-y := -I$(src) -Iinclude/math-emu -w
+5 -5
arch/um/sys-ppc/Makefile
··· 6 OBJS = ptrace.o sigcontext.o checksum.o miscthings.o misc.o \ 7 ptrace_user.o sysrq.o 8 9 - EXTRA_AFLAGS := -DCONFIG_PPC32 -I. -I$(srctree)/arch/ppc/kernel 10 11 all: $(OBJ) 12 ··· 15 $(LD) $(LINKFLAGS) --start-group $^ --end-group -o $@ 16 17 ptrace_user.o: ptrace_user.c 18 - $(CC) -D__KERNEL__ $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< 19 20 sigcontext.o: sigcontext.c 21 - $(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< 22 23 checksum.S: 24 rm -f $@ ··· 53 checksum.o: checksum.S 54 rm -f asm 55 ln -s $(srctree)/include/asm-ppc asm 56 - $(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o 57 rm -f asm 58 59 misc.o: misc.S ppc_defs.h 60 rm -f asm 61 ln -s $(srctree)/include/asm-ppc asm 62 - $(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o 63 rm -f asm 64 65 clean-files := $(OBJS) ppc_defs.h checksum.S mk_defs.c
··· 6 OBJS = ptrace.o sigcontext.o checksum.o miscthings.o misc.o \ 7 ptrace_user.o sysrq.o 8 9 + asflags-y := -DCONFIG_PPC32 -I. -I$(srctree)/arch/ppc/kernel 10 11 all: $(OBJ) 12 ··· 15 $(LD) $(LINKFLAGS) --start-group $^ --end-group -o $@ 16 17 ptrace_user.o: ptrace_user.c 18 + $(CC) -D__KERNEL__ $(USER_CFLAGS) $(ccflags-y) -c -o $@ $< 19 20 sigcontext.o: sigcontext.c 21 + $(CC) $(USER_CFLAGS) $(ccflags-y) -c -o $@ $< 22 23 checksum.S: 24 rm -f $@ ··· 53 checksum.o: checksum.S 54 rm -f asm 55 ln -s $(srctree)/include/asm-ppc asm 56 + $(CC) $(asflags-y) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o 57 rm -f asm 58 59 misc.o: misc.S ppc_defs.h 60 rm -f asm 61 ln -s $(srctree)/include/asm-ppc asm 62 + $(CC) $(asflags-y) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o 63 rm -f asm 64 65 clean-files := $(OBJS) ppc_defs.h checksum.S mk_defs.c
+1 -1
arch/xtensa/boot/Makefile
··· 14 15 BIG_ENDIAN := $(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#") 16 17 - export EXTRA_CFLAGS 18 export BIG_ENDIAN 19 20 subdir-y := lib
··· 14 15 BIG_ENDIAN := $(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#") 16 17 + export ccflags-y 18 export BIG_ENDIAN 19 20 subdir-y := lib
+1 -1
arch/xtensa/boot/lib/Makefile
··· 6 7 lib-y += $(zlib:.c=.o) zmem.o 8 9 - EXTRA_CFLAGS += -Ilib/zlib_inflate 10 11 quiet_cmd_copy_zlib = COPY $@ 12 cmd_copy_zlib = cat $< > $@
··· 6 7 lib-y += $(zlib:.c=.o) zmem.o 8 9 + ccflags-y := -Ilib/zlib_inflate 10 11 quiet_cmd_copy_zlib = COPY $@ 12 cmd_copy_zlib = cat $< > $@
+2 -2
drivers/char/mwave/Makefile
··· 9 mwave-y := mwavedd.o smapi.o tp3780i.o 3780i.o 10 11 # To have the mwave driver disable other uarts if necessary 12 - # EXTRA_CFLAGS += -DMWAVE_FUTZ_WITH_OTHER_DEVICES 13 14 # To compile in lots (~20 KiB) of run-time enablable printk()s for debugging: 15 - ccflags-y := -DMW_TRACE
··· 9 mwave-y := mwavedd.o smapi.o tp3780i.o 3780i.o 10 11 # To have the mwave driver disable other uarts if necessary 12 + # ccflags-y := -DMWAVE_FUTZ_WITH_OTHER_DEVICES 13 14 # To compile in lots (~20 KiB) of run-time enablable printk()s for debugging: 15 + ccflags-y += -DMW_TRACE
+1 -1
drivers/char/mwave/README
··· 11 0x0008 tp3780i tracing 12 13 Tracing only occurs if the driver has been compiled with the 14 - MW_TRACE macro #defined (i.e. let EXTRA_CFLAGS += -DMW_TRACE 15 in the Makefile). 16 17 mwave_3780i_irq=5/7/10/11/15
··· 11 0x0008 tp3780i tracing 12 13 Tracing only occurs if the driver has been compiled with the 14 + MW_TRACE macro #defined (i.e. let ccflags-y := -DMW_TRACE 15 in the Makefile). 16 17 mwave_3780i_irq=5/7/10/11/15
+2 -6
drivers/dma/Makefile
··· 1 - ifeq ($(CONFIG_DMADEVICES_DEBUG),y) 2 - ccflags-y += -DDEBUG 3 - endif 4 - ifeq ($(CONFIG_DMADEVICES_VDEBUG),y) 5 - ccflags-y += -DVERBOSE_DEBUG 6 - endif 7 8 obj-$(CONFIG_DMA_ENGINE) += dmaengine.o 9 obj-$(CONFIG_NET_DMA) += iovlock.o
··· 1 + ccflags-$(CONFIG_DMADEVICES_DEBUG) := -DDEBUG 2 + ccflags-$(CONFIG_DMADEVICES_VDEBUG) += -DVERBOSE_DEBUG 3 4 obj-$(CONFIG_DMA_ENGINE) += dmaengine.o 5 obj-$(CONFIG_NET_DMA) += iovlock.o
+1 -3
drivers/hwmon/Makefile
··· 122 obj-$(CONFIG_SENSORS_MAX34440) += max34440.o 123 obj-$(CONFIG_SENSORS_MAX8688) += max8688.o 124 125 - ifeq ($(CONFIG_HWMON_DEBUG_CHIP),y) 126 - EXTRA_CFLAGS += -DDEBUG 127 - endif 128
··· 122 obj-$(CONFIG_SENSORS_MAX34440) += max34440.o 123 obj-$(CONFIG_SENSORS_MAX8688) += max8688.o 124 125 + ccflags-$(CONFIG_HWMON_DEBUG_CHIP) := -DDEBUG 126
+1 -1
drivers/ide/Makefile
··· 2 # link order is important here 3 # 4 5 - EXTRA_CFLAGS += -Idrivers/ide 6 7 ide-core-y += ide.o ide-ioctls.o ide-io.o ide-iops.o ide-lib.o ide-probe.o \ 8 ide-taskfile.o ide-pm.o ide-park.o ide-sysfs.o ide-devsets.o \
··· 2 # link order is important here 3 # 4 5 + ccflags-y := -Idrivers/ide 6 7 ide-core-y += ide.o ide-ioctls.o ide-io.o ide-iops.o ide-lib.o ide-probe.o \ 8 ide-taskfile.o ide-pm.o ide-park.o ide-sysfs.o ide-devsets.o \
+1 -1
drivers/ieee802154/Makefile
··· 1 obj-$(CONFIG_IEEE802154_FAKEHARD) += fakehard.o 2 3 - EXTRA_CFLAGS += -DDEBUG -DCONFIG_FFD
··· 1 obj-$(CONFIG_IEEE802154_FAKEHARD) += fakehard.o 2 3 + ccflags-y := -DDEBUG -DCONFIG_FFD
+1 -1
drivers/isdn/hisax/Makefile
··· 4 5 # Define maximum number of cards 6 7 - EXTRA_CFLAGS += -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS) 8 9 obj-$(CONFIG_ISDN_DRV_HISAX) += hisax.o 10 obj-$(CONFIG_HISAX_SEDLBAUER_CS) += sedlbauer_cs.o
··· 4 5 # Define maximum number of cards 6 7 + ccflags-y := -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS) 8 9 obj-$(CONFIG_ISDN_DRV_HISAX) += hisax.o 10 obj-$(CONFIG_HISAX_SEDLBAUER_CS) += sedlbauer_cs.o
+1 -3
drivers/memstick/Makefile
··· 2 # Makefile for the kernel MemoryStick device drivers. 3 # 4 5 - ifeq ($(CONFIG_MEMSTICK_DEBUG),y) 6 - EXTRA_CFLAGS += -DDEBUG 7 - endif 8 9 obj-$(CONFIG_MEMSTICK) += core/ 10 obj-$(CONFIG_MEMSTICK) += host/
··· 2 # Makefile for the kernel MemoryStick device drivers. 3 # 4 5 + subdir-ccflags-$(CONFIG_MEMSTICK_DEBUG) := -DDEBUG 6 7 obj-$(CONFIG_MEMSTICK) += core/ 8 obj-$(CONFIG_MEMSTICK) += host/
-4
drivers/memstick/core/Makefile
··· 2 # Makefile for the kernel MemoryStick core. 3 # 4 5 - ifeq ($(CONFIG_MEMSTICK_DEBUG),y) 6 - EXTRA_CFLAGS += -DDEBUG 7 - endif 8 - 9 obj-$(CONFIG_MEMSTICK) += memstick.o 10 11 obj-$(CONFIG_MSPRO_BLOCK) += mspro_block.o
··· 2 # Makefile for the kernel MemoryStick core. 3 # 4 5 obj-$(CONFIG_MEMSTICK) += memstick.o 6 7 obj-$(CONFIG_MSPRO_BLOCK) += mspro_block.o
-4
drivers/memstick/host/Makefile
··· 2 # Makefile for MemoryStick host controller drivers 3 # 4 5 - ifeq ($(CONFIG_MEMSTICK_DEBUG),y) 6 - EXTRA_CFLAGS += -DDEBUG 7 - endif 8 - 9 obj-$(CONFIG_MEMSTICK_TIFM_MS) += tifm_ms.o 10 obj-$(CONFIG_MEMSTICK_JMICRON_38X) += jmb38x_ms.o
··· 2 # Makefile for MemoryStick host controller drivers 3 # 4 5 obj-$(CONFIG_MEMSTICK_TIFM_MS) += tifm_ms.o 6 obj-$(CONFIG_MEMSTICK_JMICRON_38X) += jmb38x_ms.o
+1 -1
drivers/message/fusion/Makefile
··· 2 3 # enable verbose logging 4 # CONFIG_FUSION_LOGGING needs to be enabled in Kconfig 5 - #EXTRA_CFLAGS += -DMPT_DEBUG_VERBOSE 6 7 8 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC
··· 2 3 # enable verbose logging 4 # CONFIG_FUSION_LOGGING needs to be enabled in Kconfig 5 + #ccflags-y := -DMPT_DEBUG_VERBOSE 6 7 8 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC
+1 -3
drivers/misc/cb710/Makefile
··· 1 - ifeq ($(CONFIG_CB710_DEBUG),y) 2 - EXTRA_CFLAGS += -DDEBUG 3 - endif 4 5 obj-$(CONFIG_CB710_CORE) += cb710.o 6
··· 1 + ccflags-$(CONFIG_CB710_DEBUG) := -DDEBUG 2 3 obj-$(CONFIG_CB710_CORE) += cb710.o 4
+1 -3
drivers/misc/sgi-gru/Makefile
··· 1 - ifdef CONFIG_SGI_GRU_DEBUG 2 - EXTRA_CFLAGS += -DDEBUG 3 - endif 4 5 obj-$(CONFIG_SGI_GRU) := gru.o 6 gru-y := grufile.o grumain.o grufault.o grutlbpurge.o gruprocfs.o grukservices.o gruhandles.o grukdump.o
··· 1 + ccflags-$(CONFIG_SGI_GRU_DEBUG) := -DDEBUG 2 3 obj-$(CONFIG_SGI_GRU) := gru.o 4 gru-y := grufile.o grumain.o grufault.o grutlbpurge.o gruprocfs.o grukservices.o gruhandles.o grukdump.o
+1 -3
drivers/net/caif/Makefile
··· 1 - ifeq ($(CONFIG_CAIF_DEBUG),y) 2 - EXTRA_CFLAGS += -DDEBUG 3 - endif 4 5 # Serial interface 6 obj-$(CONFIG_CAIF_TTY) += caif_serial.o
··· 1 + ccflags-$(CONFIG_CAIF_DEBUG) := -DDEBUG 2 3 # Serial interface 4 obj-$(CONFIG_CAIF_TTY) += caif_serial.o
+1 -1
drivers/net/skfp/Makefile
··· 17 # projects. To keep the source common for all those drivers (and 18 # thus simplify fixes to it), please do not clean it up! 19 20 - EXTRA_CFLAGS += -Idrivers/net/skfp -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes
··· 17 # projects. To keep the source common for all those drivers (and 18 # thus simplify fixes to it), please do not clean it up! 19 20 + ccflags-y := -Idrivers/net/skfp -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes
+1 -1
drivers/net/wan/lmc/Makefile
··· 14 # -DDEBUG \ 15 # -DLMC_PACKET_LOG 16 17 - EXTRA_CFLAGS += -I. $(DBGDEF)
··· 14 # -DDEBUG \ 15 # -DLMC_PACKET_LOG 16 17 + ccflags-y := -I. $(DBGDEF)
+2 -2
drivers/net/wireless/hostap/hostap_config.h
··· 30 31 /* Following defines can be used to remove unneeded parts of the driver, e.g., 32 * to limit the size of the kernel module. Definitions can be added here in 33 - * hostap_config.h or they can be added to make command with EXTRA_CFLAGS, 34 * e.g., 35 - * 'make pccard EXTRA_CFLAGS="-DPRISM2_NO_DEBUG -DPRISM2_NO_PROCFS_DEBUG"' 36 */ 37 38 /* Do not include debug messages into the driver */
··· 30 31 /* Following defines can be used to remove unneeded parts of the driver, e.g., 32 * to limit the size of the kernel module. Definitions can be added here in 33 + * hostap_config.h or they can be added to make command with ccflags-y, 34 * e.g., 35 + * 'make pccard ccflags-y="-DPRISM2_NO_DEBUG -DPRISM2_NO_PROCFS_DEBUG"' 36 */ 37 38 /* Do not include debug messages into the driver */
+1 -3
drivers/net/wireless/zd1211rw/Makefile
··· 5 zd_rf_al7230b.o zd_rf_uw2453.o \ 6 zd_rf.o zd_usb.o 7 8 - ifeq ($(CONFIG_ZD1211RW_DEBUG),y) 9 - EXTRA_CFLAGS += -DDEBUG 10 - endif 11
··· 5 zd_rf_al7230b.o zd_rf_uw2453.o \ 6 zd_rf.o zd_usb.o 7 8 + ccflags-$(CONFIG_ZD1211RW_DEBUG) := -DDEBUG 9
+1 -3
drivers/pps/clients/Makefile
··· 6 obj-$(CONFIG_PPS_CLIENT_LDISC) += pps-ldisc.o 7 obj-$(CONFIG_PPS_CLIENT_PARPORT) += pps_parport.o 8 9 - ifeq ($(CONFIG_PPS_DEBUG),y) 10 - EXTRA_CFLAGS += -DDEBUG 11 - endif
··· 6 obj-$(CONFIG_PPS_CLIENT_LDISC) += pps-ldisc.o 7 obj-$(CONFIG_PPS_CLIENT_PARPORT) += pps_parport.o 8 9 + ccflags-$(CONFIG_PPS_DEBUG) := -DDEBUG
+1 -3
drivers/rapidio/Makefile
··· 5 6 obj-$(CONFIG_RAPIDIO) += switches/ 7 8 - ifeq ($(CONFIG_RAPIDIO_DEBUG),y) 9 - EXTRA_CFLAGS += -DDEBUG 10 - endif
··· 5 6 obj-$(CONFIG_RAPIDIO) += switches/ 7 8 + subdir-ccflags-$(CONFIG_RAPIDIO_DEBUG) := -DDEBUG
-4
drivers/rapidio/switches/Makefile
··· 7 obj-$(CONFIG_RAPIDIO_TSI568) += tsi568.o 8 obj-$(CONFIG_RAPIDIO_TSI500) += tsi500.o 9 obj-$(CONFIG_RAPIDIO_CPS_GEN2) += idt_gen2.o 10 - 11 - ifeq ($(CONFIG_RAPIDIO_DEBUG),y) 12 - EXTRA_CFLAGS += -DDEBUG 13 - endif
··· 7 obj-$(CONFIG_RAPIDIO_TSI568) += tsi568.o 8 obj-$(CONFIG_RAPIDIO_TSI500) += tsi500.o 9 obj-$(CONFIG_RAPIDIO_CPS_GEN2) += idt_gen2.o
+1 -3
drivers/rtc/Makefile
··· 2 # Makefile for RTC class/drivers. 3 # 4 5 - ifeq ($(CONFIG_RTC_DEBUG),y) 6 - EXTRA_CFLAGS += -DDEBUG 7 - endif 8 9 obj-$(CONFIG_RTC_LIB) += rtc-lib.o 10 obj-$(CONFIG_RTC_HCTOSYS) += hctosys.o
··· 2 # Makefile for RTC class/drivers. 3 # 4 5 + ccflags-$(CONFIG_RTC_DEBUG) := -DDEBUG 6 7 obj-$(CONFIG_RTC_LIB) += rtc-lib.o 8 obj-$(CONFIG_RTC_HCTOSYS) += hctosys.o
+1 -1
drivers/scsi/aacraid/Makefile
··· 5 aacraid-objs := linit.o aachba.o commctrl.o comminit.o commsup.o \ 6 dpcsup.o rx.o sa.o rkt.o nark.o 7 8 - EXTRA_CFLAGS := -Idrivers/scsi
··· 5 aacraid-objs := linit.o aachba.o commctrl.o comminit.o commsup.o \ 6 dpcsup.o rx.o sa.o rkt.o nark.o 7 8 + ccflags-y := -Idrivers/scsi
+1 -3
drivers/scsi/aic94xx/Makefile
··· 22 # along with the aic94xx driver; if not, write to the Free Software 23 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 24 25 - ifeq ($(CONFIG_AIC94XX_DEBUG),y) 26 - EXTRA_CFLAGS += -DASD_DEBUG -DASD_ENTER_EXIT 27 - endif 28 29 obj-$(CONFIG_SCSI_AIC94XX) += aic94xx.o 30 aic94xx-y += aic94xx_init.o \
··· 22 # along with the aic94xx driver; if not, write to the Free Software 23 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 24 25 + ccflags-$(CONFIG_AIC94XX_DEBUG) := -DASD_DEBUG -DASD_ENTER_EXIT 26 27 obj-$(CONFIG_SCSI_AIC94XX) += aic94xx.o 28 aic94xx-y += aic94xx_init.o \
drivers/scsi/libsas/Makefile
+2 -4
drivers/scsi/lpfc/Makefile
··· 19 # *******************************************************************/ 20 ###################################################################### 21 22 - ifneq ($(GCOV),) 23 - EXTRA_CFLAGS += -fprofile-arcs -ftest-coverage 24 - EXTRA_CFLAGS += -O0 25 - endif 26 27 obj-$(CONFIG_SCSI_LPFC) := lpfc.o 28
··· 19 # *******************************************************************/ 20 ###################################################################### 21 22 + ccflags-$(GCOV) := -fprofile-arcs -ftest-coverage 23 + ccflags-$(GCOV) += -O0 24 25 obj-$(CONFIG_SCSI_LPFC) := lpfc.o 26
+1 -3
drivers/scsi/mvsas/Makefile
··· 21 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 22 # USA 23 24 - ifeq ($(CONFIG_SCSI_MVSAS_DEBUG),y) 25 - EXTRA_CFLAGS += -DMV_DEBUG 26 - endif 27 28 obj-$(CONFIG_SCSI_MVSAS) += mvsas.o 29 mvsas-y += mv_init.o \
··· 21 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 22 # USA 23 24 + ccflags-$(CONFIG_SCSI_MVSAS_DEBUG) := -DMV_DEBUG 25 26 obj-$(CONFIG_SCSI_MVSAS) += mvsas.o 27 mvsas-y += mv_init.o \
+1 -1
drivers/scsi/pcmcia/Makefile
··· 1 2 - EXTRA_CFLAGS += -Idrivers/scsi 3 4 # 16-bit client drivers 5 obj-$(CONFIG_PCMCIA_QLOGIC) += qlogic_cs.o
··· 1 2 + ccflags-y := -Idrivers/scsi 3 4 # 16-bit client drivers 5 obj-$(CONFIG_PCMCIA_QLOGIC) += qlogic_cs.o
+1 -4
drivers/video/intelfb/Makefile
··· 4 intelfb-$(CONFIG_FB_INTEL_I2C) += intelfb_i2c.o 5 intelfb-objs := $(intelfb-y) 6 7 - ifdef CONFIG_FB_INTEL_DEBUG 8 - #EXTRA_CFLAGS += -DDEBUG -DVERBOSE -DREGDUMP 9 - EXTRA_CFLAGS += -DDEBUG -DREGDUMP 10 - endif
··· 4 intelfb-$(CONFIG_FB_INTEL_I2C) += intelfb_i2c.o 5 intelfb-objs := $(intelfb-y) 6 7 + ccflags-$(CONFIG_FB_INTEL_DEBUG) := -DDEBUG -DREGDUMP
+1 -1
fs/affs/Makefile
··· 2 # Makefile for the Linux affs filesystem routines. 3 # 4 5 - #EXTRA_CFLAGS=-DDEBUG=1 6 7 obj-$(CONFIG_AFFS_FS) += affs.o 8
··· 2 # Makefile for the Linux affs filesystem routines. 3 # 4 5 + #ccflags-y := -DDEBUG=1 6 7 obj-$(CONFIG_AFFS_FS) += affs.o 8
+1 -1
fs/coda/Makefile
··· 9 10 # If you want debugging output, please uncomment the following line. 11 12 - # EXTRA_CFLAGS += -DDEBUG -DDEBUG_SMB_MALLOC=1
··· 9 10 # If you want debugging output, please uncomment the following line. 11 12 + # ccflags-y := -DDEBUG -DDEBUG_SMB_MALLOC=1
+1 -1
fs/gfs2/Makefile
··· 1 - EXTRA_CFLAGS := -I$(src) 2 obj-$(CONFIG_GFS2_FS) += gfs2.o 3 gfs2-y := acl.o bmap.o dir.o xattr.o glock.o \ 4 glops.o inode.o log.o lops.o main.o meta_io.o \
··· 1 + ccflags-y := -I$(src) 2 obj-$(CONFIG_GFS2_FS) += gfs2.o 3 gfs2-y := acl.o bmap.o dir.o xattr.o glock.o \ 4 glops.o inode.o log.o lops.o main.o meta_io.o \
+1 -1
fs/jfs/Makefile
··· 13 14 jfs-$(CONFIG_JFS_POSIX_ACL) += acl.o 15 16 - EXTRA_CFLAGS += -D_JFS_4K
··· 13 14 jfs-$(CONFIG_JFS_POSIX_ACL) += acl.o 15 16 + ccflags-y := -D_JFS_4K
+1 -1
fs/ncpfs/Makefile
··· 11 ncpfs-$(CONFIG_NCPFS_NFS_NS) += symlink.o 12 13 # If you want debugging output, please uncomment the following line 14 - # EXTRA_CFLAGS += -DDEBUG_NCP=1 15 16 CFLAGS_ncplib_kernel.o := -finline-functions
··· 11 ncpfs-$(CONFIG_NCPFS_NFS_NS) += symlink.o 12 13 # If you want debugging output, please uncomment the following line 14 + # ccflags-y := -DDEBUG_NCP=1 15 16 CFLAGS_ncplib_kernel.o := -finline-functions
+7 -12
fs/ntfs/Makefile
··· 2 3 obj-$(CONFIG_NTFS_FS) += ntfs.o 4 5 - ntfs-objs := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \ 6 - index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \ 7 - unistr.o upcase.o 8 9 - EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.30\" 10 11 - ifeq ($(CONFIG_NTFS_DEBUG),y) 12 - EXTRA_CFLAGS += -DDEBUG 13 - endif 14 15 - ifeq ($(CONFIG_NTFS_RW),y) 16 - EXTRA_CFLAGS += -DNTFS_RW 17 - 18 - ntfs-objs += bitmap.o lcnalloc.o logfile.o quota.o usnjrnl.o 19 - endif
··· 2 3 obj-$(CONFIG_NTFS_FS) += ntfs.o 4 5 + ntfs-y := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \ 6 + index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \ 7 + unistr.o upcase.o 8 9 + ntfs-$(CONFIG_NTFS_RW) += bitmap.o lcnalloc.o logfile.o quota.o usnjrnl.o 10 11 + ccflags-y := -DNTFS_VERSION=\"2.1.30\" 12 + ccflags-$(CONFIG_NTFS_DEBUG) += -DDEBUG 13 + ccflags-$(CONFIG_NTFS_RW) += -DNTFS_RW 14
+2 -2
fs/ocfs2/Makefile
··· 1 - EXTRA_CFLAGS += -Ifs/ocfs2 2 3 - EXTRA_CFLAGS += -DCATCH_BH_JBD_RACES 4 5 obj-$(CONFIG_OCFS2_FS) += \ 6 ocfs2.o \
··· 1 + ccflags-y := -Ifs/ocfs2 2 3 + ccflags-y += -DCATCH_BH_JBD_RACES 4 5 obj-$(CONFIG_OCFS2_FS) += \ 6 ocfs2.o \
+1 -1
fs/ocfs2/dlm/Makefile
··· 1 - EXTRA_CFLAGS += -Ifs/ocfs2 2 3 obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o 4
··· 1 + ccflags-y := -Ifs/ocfs2 2 3 obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o 4
+1 -1
fs/ocfs2/dlmfs/Makefile
··· 1 - EXTRA_CFLAGS += -Ifs/ocfs2 2 3 obj-$(CONFIG_OCFS2_FS) += ocfs2_dlmfs.o 4
··· 1 + ccflags-y := -Ifs/ocfs2 2 3 obj-$(CONFIG_OCFS2_FS) += ocfs2_dlmfs.o 4
+1 -3
fs/reiserfs/Makefile
··· 31 # and causing a panic. Since this behavior only affects ppc32, this ifeq 32 # will work around it. If any other architecture displays this behavior, 33 # add it here. 34 - ifeq ($(CONFIG_PPC32),y) 35 - EXTRA_CFLAGS := $(call cc-ifversion, -lt, 0400, -O1) 36 - endif 37 38 TAGS: 39 etags *.c
··· 31 # and causing a panic. Since this behavior only affects ppc32, this ifeq 32 # will work around it. If any other architecture displays this behavior, 33 # add it here. 34 + ccflags-$(CONFIG_PPC32) := $(call cc-ifversion, -lt, 0400, -O1) 35 36 TAGS: 37 etags *.c
+2 -5
fs/xfs/Makefile
··· 16 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 17 # 18 19 - EXTRA_CFLAGS += -I$(src) -I$(src)/linux-2.6 20 21 XFS_LINUX := linux-2.6 22 - 23 - ifeq ($(CONFIG_XFS_DEBUG),y) 24 - EXTRA_CFLAGS += -g 25 - endif 26 27 obj-$(CONFIG_XFS_FS) += xfs.o 28
··· 16 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 17 # 18 19 + ccflags-y := -I$(src) -I$(src)/linux-2.6 20 + ccflags-$(CONFIG_XFS_DEBUG) += -g 21 22 XFS_LINUX := linux-2.6 23 24 obj-$(CONFIG_XFS_FS) += xfs.o 25
+1 -1
kernel/gcov/Makefile
··· 1 - EXTRA_CFLAGS := -DSRCTREE='"$(srctree)"' -DOBJTREE='"$(objtree)"' 2 3 obj-$(CONFIG_GCOV_KERNEL) := base.o fs.o gcc_3_4.o
··· 1 + ccflags-y := -DSRCTREE='"$(srctree)"' -DOBJTREE='"$(objtree)"' 2 3 obj-$(CONFIG_GCOV_KERNEL) := base.o fs.o gcc_3_4.o
+2 -1
kernel/power/Makefile
··· 1 - ccflags-$(CONFIG_PM_DEBUG) := -DDEBUG 2 3 obj-$(CONFIG_PM) += main.o 4 obj-$(CONFIG_PM_SLEEP) += console.o
··· 1 + 2 + ccflags-$(CONFIG_PM_DEBUG) := -DDEBUG 3 4 obj-$(CONFIG_PM) += main.o 5 obj-$(CONFIG_PM_SLEEP) += console.o