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
This commit is contained in:
commit
a44f99c7ef
|
@ -95,8 +95,8 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS)
|
|||
KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
|
||||
endif
|
||||
|
||||
EXTRA_CFLAGS := -fpic -fno-builtin
|
||||
EXTRA_AFLAGS := -Wa,-march=all
|
||||
ccflags-y := -fpic -fno-builtin
|
||||
asflags-y := -Wa,-march=all
|
||||
|
||||
# Provide size of uncompressed kernel to the decompressor via a linker symbol.
|
||||
LDFLAGS_vmlinux = --defsym _image_size=$(shell stat -c "%s" $(obj)/../Image)
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
# Copyright (C) 2001 ARM Limited
|
||||
#
|
||||
|
||||
# EXTRA_CFLAGS := -DDEBUG
|
||||
# EXTRA_AFLAGS := -DDEBUG
|
||||
# ccflags-y := -DDEBUG
|
||||
# asflags-y := -DDEBUG
|
||||
|
||||
KBUILD_AFLAGS :=$(KBUILD_AFLAGS:-msoft-float=-Wa,-mfpu=softvfp+vfp)
|
||||
LDFLAGS +=--no-warn-mismatch
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#
|
||||
|
||||
targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
|
||||
EXTRA_AFLAGS := -traditional
|
||||
asflags-y := -traditional
|
||||
|
||||
OBJECTS = $(obj)/head.o $(obj)/misc.o
|
||||
|
||||
|
|
|
@ -45,8 +45,8 @@ FORCE : $(obj)/$(offsets-file)
|
|||
# Makefile for Kernel-based Virtual Machine module
|
||||
#
|
||||
|
||||
EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/
|
||||
EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/
|
||||
ccflags-y := -Ivirt/kvm -Iarch/ia64/kvm/
|
||||
asflags-y := -Ivirt/kvm -Iarch/ia64/kvm/
|
||||
|
||||
common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \
|
||||
coalesced_mmio.o irq_comm.o assigned-dev.o)
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
# Copyright (C) 1999,2001-2006,2008 Silicon Graphics, Inc. All Rights Reserved.
|
||||
#
|
||||
|
||||
EXTRA_CFLAGS += -Iarch/ia64/sn/include
|
||||
ccflags-y := -Iarch/ia64/sn/include
|
||||
|
||||
obj-y += setup.o bte.o bte_error.o irq.o mca.o idle.o \
|
||||
huberror.o io_acpi_init.o io_common.o \
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
# sn2 specific kernel files
|
||||
#
|
||||
|
||||
EXTRA_CFLAGS += -Iarch/ia64/sn/include
|
||||
ccflags-y := -Iarch/ia64/sn/include
|
||||
|
||||
obj-y += cache.o io.o ptc_deadlock.o sn2_smp.o sn_proc_fs.o \
|
||||
prominfo_proc.o timer.o timer_interrupt.o sn_hwperf.o
|
||||
|
|
|
@ -7,6 +7,6 @@
|
|||
#
|
||||
# Makefile for the sn pci general routines.
|
||||
|
||||
EXTRA_CFLAGS += -Iarch/ia64/sn/include
|
||||
ccflags-y := -Iarch/ia64/sn/include
|
||||
|
||||
obj-y := pci_dma.o tioca_provider.o tioce_provider.o pcibr/
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#
|
||||
# Makefile for the sn2 io routines.
|
||||
|
||||
EXTRA_CFLAGS += -Iarch/ia64/sn/include
|
||||
ccflags-y := -Iarch/ia64/sn/include
|
||||
|
||||
obj-y += pcibr_dma.o pcibr_reg.o \
|
||||
pcibr_ate.o pcibr_provider.o
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
# Copyright (C) 2008 Silicon Graphics, Inc. All Rights Reserved.
|
||||
#
|
||||
|
||||
EXTRA_CFLAGS += -Iarch/ia64/sn/include
|
||||
ccflags-y := -Iarch/ia64/sn/include
|
||||
|
||||
obj-y += setup.o
|
||||
obj-$(CONFIG_IA64_GENERIC) += machvec.o
|
||||
|
|
|
@ -6,7 +6,7 @@ ifdef CONFIG_FUNCTION_TRACER
|
|||
CFLAGS_REMOVE_cache.o = -pg
|
||||
endif
|
||||
|
||||
EXTRA_CFLAGS += -DCPU_MAJOR=$(CPU_MAJOR) -DCPU_MINOR=$(CPU_MINOR) \
|
||||
ccflags-y := -DCPU_MAJOR=$(CPU_MAJOR) -DCPU_MINOR=$(CPU_MINOR) \
|
||||
-DCPU_REV=$(CPU_REV)
|
||||
|
||||
obj-y += cache.o cpuinfo.o cpuinfo-pvr-full.o cpuinfo-static.o mb.o pvr.o
|
||||
|
|
|
@ -286,11 +286,11 @@ CLEAN_FILES += vmlinux.32 vmlinux.64
|
|||
archprepare:
|
||||
ifdef CONFIG_MIPS32_N32
|
||||
@echo ' Checking missing-syscalls for N32'
|
||||
$(Q)$(MAKE) $(build)=. missing-syscalls EXTRA_CFLAGS="-mabi=n32"
|
||||
$(Q)$(MAKE) $(build)=. missing-syscalls ccflags-y="-mabi=n32"
|
||||
endif
|
||||
ifdef CONFIG_MIPS32_O32
|
||||
@echo ' Checking missing-syscalls for O32'
|
||||
$(Q)$(MAKE) $(build)=. missing-syscalls EXTRA_CFLAGS="-mabi=32"
|
||||
$(Q)$(MAKE) $(build)=. missing-syscalls ccflags-y="-mabi=32"
|
||||
endif
|
||||
|
||||
install:
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o
|
||||
|
||||
EXTRA_CFLAGS += -Werror
|
||||
ccflags-y := -Werror
|
||||
|
|
|
@ -9,4 +9,4 @@ lib-$(CONFIG_ARC_MEMORY) += memory.o
|
|||
lib-$(CONFIG_ARC_CONSOLE) += arc_con.o
|
||||
lib-$(CONFIG_ARC_PROMLIB) += promlib.o
|
||||
|
||||
EXTRA_CFLAGS += -Werror
|
||||
ccflags-y := -Werror
|
||||
|
|
|
@ -17,4 +17,4 @@ obj-$(CONFIG_JZ4740_QI_LB60) += board-qi_lb60.o
|
|||
|
||||
obj-$(CONFIG_PM) += pm.o
|
||||
|
||||
EXTRA_CFLAGS += -Werror -Wall
|
||||
ccflags-y := -Werror -Wall
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
EXTRA_CFLAGS := -Werror
|
||||
ccflags-y := -Werror
|
||||
|
||||
obj-$(CONFIG_OPROFILE) += oprofile.o
|
||||
|
||||
|
|
|
@ -6,4 +6,4 @@ obj-y += irq.o prom.o py-console.o setup.o
|
|||
|
||||
obj-$(CONFIG_SMP) += smp.o
|
||||
|
||||
EXTRA_CFLAGS += -Werror
|
||||
ccflags-y := -Werror
|
||||
|
|
|
@ -28,4 +28,4 @@ obj-y += init.o ioremap.o memory.o powertv_setup.o reset.o time.o \
|
|||
|
||||
obj-$(CONFIG_USB) += powertv-usb.o
|
||||
|
||||
EXTRA_CFLAGS += -Wall
|
||||
ccflags-y := -Wall
|
||||
|
|
|
@ -20,4 +20,4 @@ obj-y += asic-calliope.o asic-cronus.o asic-gaia.o asic-zeus.o \
|
|||
asic_devices.o asic_int.o irq_asic.o prealloc-calliope.o \
|
||||
prealloc-cronus.o prealloc-cronuslite.o prealloc-gaia.o prealloc-zeus.o
|
||||
|
||||
EXTRA_CFLAGS += -Wall -Werror
|
||||
ccflags-y := -Wall -Werror
|
||||
|
|
|
@ -18,4 +18,4 @@
|
|||
|
||||
obj-$(CONFIG_PCI) += fixup-powertv.o
|
||||
|
||||
EXTRA_CFLAGS += -Wall -Werror
|
||||
ccflags-y := -Wall -Werror
|
||||
|
|
|
@ -6,7 +6,7 @@ COMPILE_VERSION := __linux_compile_version_id__`hostname | \
|
|||
tr -c '[0-9A-Za-z]' '_'`__`date | \
|
||||
tr -c '[0-9A-Za-z]' '_'`_t
|
||||
|
||||
EXTRA_CFLAGS := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I.
|
||||
ccflags-y := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I.
|
||||
|
||||
targets := image
|
||||
targets += bzImage
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o)
|
||||
|
||||
EXTRA_CFLAGS += -Ivirt/kvm -Iarch/s390/kvm
|
||||
ccflags-y := -Ivirt/kvm -Iarch/s390/kvm
|
||||
|
||||
kvm-objs := $(common-objs) kvm-s390.o sie64a.o intercept.o interrupt.o priv.o sigp.o diag.o
|
||||
obj-$(CONFIG_KVM) += kvm.o
|
||||
|
|
|
@ -4,4 +4,4 @@
|
|||
|
||||
obj-$(CONFIG_MATHEMU) := math.o
|
||||
|
||||
EXTRA_CFLAGS := -I$(src) -Iinclude/math-emu -w
|
||||
ccflags-y := -I$(src) -Iinclude/math-emu -w
|
||||
|
|
|
@ -6,7 +6,7 @@ OBJ = built-in.o
|
|||
OBJS = ptrace.o sigcontext.o checksum.o miscthings.o misc.o \
|
||||
ptrace_user.o sysrq.o
|
||||
|
||||
EXTRA_AFLAGS := -DCONFIG_PPC32 -I. -I$(srctree)/arch/ppc/kernel
|
||||
asflags-y := -DCONFIG_PPC32 -I. -I$(srctree)/arch/ppc/kernel
|
||||
|
||||
all: $(OBJ)
|
||||
|
||||
|
@ -15,10 +15,10 @@ $(OBJ): $(OBJS)
|
|||
$(LD) $(LINKFLAGS) --start-group $^ --end-group -o $@
|
||||
|
||||
ptrace_user.o: ptrace_user.c
|
||||
$(CC) -D__KERNEL__ $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
|
||||
$(CC) -D__KERNEL__ $(USER_CFLAGS) $(ccflags-y) -c -o $@ $<
|
||||
|
||||
sigcontext.o: sigcontext.c
|
||||
$(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
|
||||
$(CC) $(USER_CFLAGS) $(ccflags-y) -c -o $@ $<
|
||||
|
||||
checksum.S:
|
||||
rm -f $@
|
||||
|
@ -53,13 +53,13 @@ ppc_defs.h: mk_defs.c ppc_defs.head \
|
|||
checksum.o: checksum.S
|
||||
rm -f asm
|
||||
ln -s $(srctree)/include/asm-ppc asm
|
||||
$(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
|
||||
$(CC) $(asflags-y) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
|
||||
rm -f asm
|
||||
|
||||
misc.o: misc.S ppc_defs.h
|
||||
rm -f asm
|
||||
ln -s $(srctree)/include/asm-ppc asm
|
||||
$(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
|
||||
$(CC) $(asflags-y) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
|
||||
rm -f asm
|
||||
|
||||
clean-files := $(OBJS) ppc_defs.h checksum.S mk_defs.c
|
||||
|
|
|
@ -14,7 +14,7 @@ HOSTFLAGS += -Iarch/$(ARCH)/boot/include
|
|||
|
||||
BIG_ENDIAN := $(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#")
|
||||
|
||||
export EXTRA_CFLAGS
|
||||
export ccflags-y
|
||||
export BIG_ENDIAN
|
||||
|
||||
subdir-y := lib
|
||||
|
|
|
@ -6,7 +6,7 @@ zlib := inffast.c inflate.c inftrees.c
|
|||
|
||||
lib-y += $(zlib:.c=.o) zmem.o
|
||||
|
||||
EXTRA_CFLAGS += -Ilib/zlib_inflate
|
||||
ccflags-y := -Ilib/zlib_inflate
|
||||
|
||||
quiet_cmd_copy_zlib = COPY $@
|
||||
cmd_copy_zlib = cat $< > $@
|
||||
|
|
|
@ -9,7 +9,7 @@ obj-$(CONFIG_MWAVE) += mwave.o
|
|||
mwave-y := mwavedd.o smapi.o tp3780i.o 3780i.o
|
||||
|
||||
# To have the mwave driver disable other uarts if necessary
|
||||
# EXTRA_CFLAGS += -DMWAVE_FUTZ_WITH_OTHER_DEVICES
|
||||
# ccflags-y := -DMWAVE_FUTZ_WITH_OTHER_DEVICES
|
||||
|
||||
# To compile in lots (~20 KiB) of run-time enablable printk()s for debugging:
|
||||
ccflags-y := -DMW_TRACE
|
||||
ccflags-y += -DMW_TRACE
|
||||
|
|
|
@ -11,7 +11,7 @@ are not saved by the BIOS and so do not persist after unload and reload.
|
|||
0x0008 tp3780i tracing
|
||||
|
||||
Tracing only occurs if the driver has been compiled with the
|
||||
MW_TRACE macro #defined (i.e. let EXTRA_CFLAGS += -DMW_TRACE
|
||||
MW_TRACE macro #defined (i.e. let ccflags-y := -DMW_TRACE
|
||||
in the Makefile).
|
||||
|
||||
mwave_3780i_irq=5/7/10/11/15
|
||||
|
|
|
@ -1,9 +1,5 @@
|
|||
ifeq ($(CONFIG_DMADEVICES_DEBUG),y)
|
||||
ccflags-y += -DDEBUG
|
||||
endif
|
||||
ifeq ($(CONFIG_DMADEVICES_VDEBUG),y)
|
||||
ccflags-y += -DVERBOSE_DEBUG
|
||||
endif
|
||||
ccflags-$(CONFIG_DMADEVICES_DEBUG) := -DDEBUG
|
||||
ccflags-$(CONFIG_DMADEVICES_VDEBUG) += -DVERBOSE_DEBUG
|
||||
|
||||
obj-$(CONFIG_DMA_ENGINE) += dmaengine.o
|
||||
obj-$(CONFIG_NET_DMA) += iovlock.o
|
||||
|
|
|
@ -122,7 +122,5 @@ obj-$(CONFIG_SENSORS_MAX16064) += max16064.o
|
|||
obj-$(CONFIG_SENSORS_MAX34440) += max34440.o
|
||||
obj-$(CONFIG_SENSORS_MAX8688) += max8688.o
|
||||
|
||||
ifeq ($(CONFIG_HWMON_DEBUG_CHIP),y)
|
||||
EXTRA_CFLAGS += -DDEBUG
|
||||
endif
|
||||
ccflags-$(CONFIG_HWMON_DEBUG_CHIP) := -DDEBUG
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# link order is important here
|
||||
#
|
||||
|
||||
EXTRA_CFLAGS += -Idrivers/ide
|
||||
ccflags-y := -Idrivers/ide
|
||||
|
||||
ide-core-y += ide.o ide-ioctls.o ide-io.o ide-iops.o ide-lib.o ide-probe.o \
|
||||
ide-taskfile.o ide-pm.o ide-park.o ide-sysfs.o ide-devsets.o \
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
obj-$(CONFIG_IEEE802154_FAKEHARD) += fakehard.o
|
||||
|
||||
EXTRA_CFLAGS += -DDEBUG -DCONFIG_FFD
|
||||
ccflags-y := -DDEBUG -DCONFIG_FFD
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
# Define maximum number of cards
|
||||
|
||||
EXTRA_CFLAGS += -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS)
|
||||
ccflags-y := -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS)
|
||||
|
||||
obj-$(CONFIG_ISDN_DRV_HISAX) += hisax.o
|
||||
obj-$(CONFIG_HISAX_SEDLBAUER_CS) += sedlbauer_cs.o
|
||||
|
|
|
@ -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/
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# enable verbose logging
|
||||
# CONFIG_FUSION_LOGGING needs to be enabled in Kconfig
|
||||
#EXTRA_CFLAGS += -DMPT_DEBUG_VERBOSE
|
||||
#ccflags-y := -DMPT_DEBUG_VERBOSE
|
||||
|
||||
|
||||
#=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
ifeq ($(CONFIG_CB710_DEBUG),y)
|
||||
EXTRA_CFLAGS += -DDEBUG
|
||||
endif
|
||||
ccflags-$(CONFIG_CB710_DEBUG) := -DDEBUG
|
||||
|
||||
obj-$(CONFIG_CB710_CORE) += cb710.o
|
||||
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
ifdef CONFIG_SGI_GRU_DEBUG
|
||||
EXTRA_CFLAGS += -DDEBUG
|
||||
endif
|
||||
ccflags-$(CONFIG_SGI_GRU_DEBUG) := -DDEBUG
|
||||
|
||||
obj-$(CONFIG_SGI_GRU) := gru.o
|
||||
gru-y := grufile.o grumain.o grufault.o grutlbpurge.o gruprocfs.o grukservices.o gruhandles.o grukdump.o
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
ifeq ($(CONFIG_CAIF_DEBUG),y)
|
||||
EXTRA_CFLAGS += -DDEBUG
|
||||
endif
|
||||
ccflags-$(CONFIG_CAIF_DEBUG) := -DDEBUG
|
||||
|
||||
# Serial interface
|
||||
obj-$(CONFIG_CAIF_TTY) += caif_serial.o
|
||||
|
|
|
@ -17,4 +17,4 @@ skfp-objs := skfddi.o hwmtm.o fplustm.o smt.o cfm.o \
|
|||
# projects. To keep the source common for all those drivers (and
|
||||
# thus simplify fixes to it), please do not clean it up!
|
||||
|
||||
EXTRA_CFLAGS += -Idrivers/net/skfp -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes
|
||||
ccflags-y := -Idrivers/net/skfp -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes
|
||||
|
|
|
@ -14,4 +14,4 @@ lmc-objs := lmc_debug.o lmc_media.o lmc_main.o lmc_proto.o
|
|||
# -DDEBUG \
|
||||
# -DLMC_PACKET_LOG
|
||||
|
||||
EXTRA_CFLAGS += -I. $(DBGDEF)
|
||||
ccflags-y := -I. $(DBGDEF)
|
||||
|
|
|
@ -30,9 +30,9 @@
|
|||
|
||||
/* Following defines can be used to remove unneeded parts of the driver, e.g.,
|
||||
* to limit the size of the kernel module. Definitions can be added here in
|
||||
* hostap_config.h or they can be added to make command with EXTRA_CFLAGS,
|
||||
* hostap_config.h or they can be added to make command with ccflags-y,
|
||||
* e.g.,
|
||||
* 'make pccard EXTRA_CFLAGS="-DPRISM2_NO_DEBUG -DPRISM2_NO_PROCFS_DEBUG"'
|
||||
* 'make pccard ccflags-y="-DPRISM2_NO_DEBUG -DPRISM2_NO_PROCFS_DEBUG"'
|
||||
*/
|
||||
|
||||
/* Do not include debug messages into the driver */
|
||||
|
|
|
@ -5,7 +5,5 @@ zd1211rw-objs := zd_chip.o zd_mac.o \
|
|||
zd_rf_al7230b.o zd_rf_uw2453.o \
|
||||
zd_rf.o zd_usb.o
|
||||
|
||||
ifeq ($(CONFIG_ZD1211RW_DEBUG),y)
|
||||
EXTRA_CFLAGS += -DDEBUG
|
||||
endif
|
||||
ccflags-$(CONFIG_ZD1211RW_DEBUG) := -DDEBUG
|
||||
|
||||
|
|
|
@ -6,6 +6,4 @@ obj-$(CONFIG_PPS_CLIENT_KTIMER) += pps-ktimer.o
|
|||
obj-$(CONFIG_PPS_CLIENT_LDISC) += pps-ldisc.o
|
||||
obj-$(CONFIG_PPS_CLIENT_PARPORT) += pps_parport.o
|
||||
|
||||
ifeq ($(CONFIG_PPS_DEBUG),y)
|
||||
EXTRA_CFLAGS += -DDEBUG
|
||||
endif
|
||||
ccflags-$(CONFIG_PPS_DEBUG) := -DDEBUG
|
||||
|
|
|
@ -5,6 +5,4 @@ obj-y += rio.o rio-access.o rio-driver.o rio-scan.o rio-sysfs.o
|
|||
|
||||
obj-$(CONFIG_RAPIDIO) += switches/
|
||||
|
||||
ifeq ($(CONFIG_RAPIDIO_DEBUG),y)
|
||||
EXTRA_CFLAGS += -DDEBUG
|
||||
endif
|
||||
subdir-ccflags-$(CONFIG_RAPIDIO_DEBUG) := -DDEBUG
|
||||
|
|
|
@ -7,7 +7,3 @@ obj-$(CONFIG_RAPIDIO_CPS_XX) += idtcps.o
|
|||
obj-$(CONFIG_RAPIDIO_TSI568) += tsi568.o
|
||||
obj-$(CONFIG_RAPIDIO_TSI500) += tsi500.o
|
||||
obj-$(CONFIG_RAPIDIO_CPS_GEN2) += idt_gen2.o
|
||||
|
||||
ifeq ($(CONFIG_RAPIDIO_DEBUG),y)
|
||||
EXTRA_CFLAGS += -DDEBUG
|
||||
endif
|
||||
|
|
|
@ -2,9 +2,7 @@
|
|||
# Makefile for RTC class/drivers.
|
||||
#
|
||||
|
||||
ifeq ($(CONFIG_RTC_DEBUG),y)
|
||||
EXTRA_CFLAGS += -DDEBUG
|
||||
endif
|
||||
ccflags-$(CONFIG_RTC_DEBUG) := -DDEBUG
|
||||
|
||||
obj-$(CONFIG_RTC_LIB) += rtc-lib.o
|
||||
obj-$(CONFIG_RTC_HCTOSYS) += hctosys.o
|
||||
|
|
|
@ -5,4 +5,4 @@ obj-$(CONFIG_SCSI_AACRAID) := aacraid.o
|
|||
aacraid-objs := linit.o aachba.o commctrl.o comminit.o commsup.o \
|
||||
dpcsup.o rx.o sa.o rkt.o nark.o
|
||||
|
||||
EXTRA_CFLAGS := -Idrivers/scsi
|
||||
ccflags-y := -Idrivers/scsi
|
||||
|
|
|
@ -22,9 +22,7 @@
|
|||
# along with the aic94xx driver; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
ifeq ($(CONFIG_AIC94XX_DEBUG),y)
|
||||
EXTRA_CFLAGS += -DASD_DEBUG -DASD_ENTER_EXIT
|
||||
endif
|
||||
ccflags-$(CONFIG_AIC94XX_DEBUG) := -DASD_DEBUG -DASD_ENTER_EXIT
|
||||
|
||||
obj-$(CONFIG_SCSI_AIC94XX) += aic94xx.o
|
||||
aic94xx-y += aic94xx_init.o \
|
||||
|
|
|
@ -19,10 +19,8 @@
|
|||
# *******************************************************************/
|
||||
######################################################################
|
||||
|
||||
ifneq ($(GCOV),)
|
||||
EXTRA_CFLAGS += -fprofile-arcs -ftest-coverage
|
||||
EXTRA_CFLAGS += -O0
|
||||
endif
|
||||
ccflags-$(GCOV) := -fprofile-arcs -ftest-coverage
|
||||
ccflags-$(GCOV) += -O0
|
||||
|
||||
obj-$(CONFIG_SCSI_LPFC) := lpfc.o
|
||||
|
||||
|
|
|
@ -21,9 +21,7 @@
|
|||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||
# USA
|
||||
|
||||
ifeq ($(CONFIG_SCSI_MVSAS_DEBUG),y)
|
||||
EXTRA_CFLAGS += -DMV_DEBUG
|
||||
endif
|
||||
ccflags-$(CONFIG_SCSI_MVSAS_DEBUG) := -DMV_DEBUG
|
||||
|
||||
obj-$(CONFIG_SCSI_MVSAS) += mvsas.o
|
||||
mvsas-y += mv_init.o \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
EXTRA_CFLAGS += -Idrivers/scsi
|
||||
ccflags-y := -Idrivers/scsi
|
||||
|
||||
# 16-bit client drivers
|
||||
obj-$(CONFIG_PCMCIA_QLOGIC) += qlogic_cs.o
|
||||
|
|
|
@ -4,7 +4,4 @@ intelfb-y := intelfbdrv.o intelfbhw.o
|
|||
intelfb-$(CONFIG_FB_INTEL_I2C) += intelfb_i2c.o
|
||||
intelfb-objs := $(intelfb-y)
|
||||
|
||||
ifdef CONFIG_FB_INTEL_DEBUG
|
||||
#EXTRA_CFLAGS += -DDEBUG -DVERBOSE -DREGDUMP
|
||||
EXTRA_CFLAGS += -DDEBUG -DREGDUMP
|
||||
endif
|
||||
ccflags-$(CONFIG_FB_INTEL_DEBUG) := -DDEBUG -DREGDUMP
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# Makefile for the Linux affs filesystem routines.
|
||||
#
|
||||
|
||||
#EXTRA_CFLAGS=-DDEBUG=1
|
||||
#ccflags-y := -DDEBUG=1
|
||||
|
||||
obj-$(CONFIG_AFFS_FS) += affs.o
|
||||
|
||||
|
|
|
@ -9,4 +9,4 @@ coda-objs := psdev.o cache.o cnode.o inode.o dir.o file.o upcall.o \
|
|||
|
||||
# If you want debugging output, please uncomment the following line.
|
||||
|
||||
# EXTRA_CFLAGS += -DDEBUG -DDEBUG_SMB_MALLOC=1
|
||||
# ccflags-y := -DDEBUG -DDEBUG_SMB_MALLOC=1
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
EXTRA_CFLAGS := -I$(src)
|
||||
ccflags-y := -I$(src)
|
||||
obj-$(CONFIG_GFS2_FS) += gfs2.o
|
||||
gfs2-y := acl.o bmap.o dir.o xattr.o glock.o \
|
||||
glops.o inode.o log.o lops.o main.o meta_io.o \
|
||||
|
|
|
@ -13,4 +13,4 @@ jfs-y := super.o file.o inode.o namei.o jfs_mount.o jfs_umount.o \
|
|||
|
||||
jfs-$(CONFIG_JFS_POSIX_ACL) += acl.o
|
||||
|
||||
EXTRA_CFLAGS += -D_JFS_4K
|
||||
ccflags-y := -D_JFS_4K
|
||||
|
|
|
@ -11,6 +11,6 @@ ncpfs-$(CONFIG_NCPFS_EXTRAS) += symlink.o
|
|||
ncpfs-$(CONFIG_NCPFS_NFS_NS) += symlink.o
|
||||
|
||||
# If you want debugging output, please uncomment the following line
|
||||
# EXTRA_CFLAGS += -DDEBUG_NCP=1
|
||||
# ccflags-y := -DDEBUG_NCP=1
|
||||
|
||||
CFLAGS_ncplib_kernel.o := -finline-functions
|
||||
|
|
|
@ -2,18 +2,13 @@
|
|||
|
||||
obj-$(CONFIG_NTFS_FS) += ntfs.o
|
||||
|
||||
ntfs-objs := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \
|
||||
ntfs-y := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \
|
||||
index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \
|
||||
unistr.o upcase.o
|
||||
|
||||
EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.30\"
|
||||
ntfs-$(CONFIG_NTFS_RW) += bitmap.o lcnalloc.o logfile.o quota.o usnjrnl.o
|
||||
|
||||
ifeq ($(CONFIG_NTFS_DEBUG),y)
|
||||
EXTRA_CFLAGS += -DDEBUG
|
||||
endif
|
||||
ccflags-y := -DNTFS_VERSION=\"2.1.30\"
|
||||
ccflags-$(CONFIG_NTFS_DEBUG) += -DDEBUG
|
||||
ccflags-$(CONFIG_NTFS_RW) += -DNTFS_RW
|
||||
|
||||
ifeq ($(CONFIG_NTFS_RW),y)
|
||||
EXTRA_CFLAGS += -DNTFS_RW
|
||||
|
||||
ntfs-objs += bitmap.o lcnalloc.o logfile.o quota.o usnjrnl.o
|
||||
endif
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
EXTRA_CFLAGS += -Ifs/ocfs2
|
||||
ccflags-y := -Ifs/ocfs2
|
||||
|
||||
EXTRA_CFLAGS += -DCATCH_BH_JBD_RACES
|
||||
ccflags-y += -DCATCH_BH_JBD_RACES
|
||||
|
||||
obj-$(CONFIG_OCFS2_FS) += \
|
||||
ocfs2.o \
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
EXTRA_CFLAGS += -Ifs/ocfs2
|
||||
ccflags-y := -Ifs/ocfs2
|
||||
|
||||
obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
EXTRA_CFLAGS += -Ifs/ocfs2
|
||||
ccflags-y := -Ifs/ocfs2
|
||||
|
||||
obj-$(CONFIG_OCFS2_FS) += ocfs2_dlmfs.o
|
||||
|
||||
|
|
|
@ -31,9 +31,7 @@ endif
|
|||
# and causing a panic. Since this behavior only affects ppc32, this ifeq
|
||||
# will work around it. If any other architecture displays this behavior,
|
||||
# add it here.
|
||||
ifeq ($(CONFIG_PPC32),y)
|
||||
EXTRA_CFLAGS := $(call cc-ifversion, -lt, 0400, -O1)
|
||||
endif
|
||||
ccflags-$(CONFIG_PPC32) := $(call cc-ifversion, -lt, 0400, -O1)
|
||||
|
||||
TAGS:
|
||||
etags *.c
|
||||
|
|
|
@ -16,14 +16,11 @@
|
|||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
#
|
||||
|
||||
EXTRA_CFLAGS += -I$(src) -I$(src)/linux-2.6
|
||||
ccflags-y := -I$(src) -I$(src)/linux-2.6
|
||||
ccflags-$(CONFIG_XFS_DEBUG) += -g
|
||||
|
||||
XFS_LINUX := linux-2.6
|
||||
|
||||
ifeq ($(CONFIG_XFS_DEBUG),y)
|
||||
EXTRA_CFLAGS += -g
|
||||
endif
|
||||
|
||||
obj-$(CONFIG_XFS_FS) += xfs.o
|
||||
|
||||
xfs-y += linux-2.6/xfs_trace.o
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
EXTRA_CFLAGS := -DSRCTREE='"$(srctree)"' -DOBJTREE='"$(objtree)"'
|
||||
ccflags-y := -DSRCTREE='"$(srctree)"' -DOBJTREE='"$(objtree)"'
|
||||
|
||||
obj-$(CONFIG_GCOV_KERNEL) := base.o fs.o gcc_3_4.o
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
ccflags-$(CONFIG_PM_DEBUG) := -DDEBUG
|
||||
|
||||
obj-$(CONFIG_PM) += main.o
|
||||
|
|
Loading…
Reference in New Issue