diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-20 21:14:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-20 21:14:55 -0400 |
| commit | a44f99c7efdb88fa41128065c9a9445c19894e34 (patch) | |
| tree | 9d9dc6026b2c0409eca05e360c98b8a688ccdb1e /arch/arm/vfp | |
| parent | b87a2d3e3147bd140da2eae584772c353d11421b (diff) | |
| parent | 22942c00a6ad6e9e93b53811a6de72c821c15d22 (diff) | |
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
Diffstat (limited to 'arch/arm/vfp')
| -rw-r--r-- | arch/arm/vfp/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/vfp/Makefile b/arch/arm/vfp/Makefile index 39f6d8e1af73..6de73aab0195 100644 --- a/arch/arm/vfp/Makefile +++ b/arch/arm/vfp/Makefile | |||
| @@ -4,8 +4,8 @@ | |||
| 4 | # Copyright (C) 2001 ARM Limited | 4 | # Copyright (C) 2001 ARM Limited |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | # EXTRA_CFLAGS := -DDEBUG | 7 | # ccflags-y := -DDEBUG |
| 8 | # EXTRA_AFLAGS := -DDEBUG | 8 | # asflags-y := -DDEBUG |
| 9 | 9 | ||
| 10 | KBUILD_AFLAGS :=$(KBUILD_AFLAGS:-msoft-float=-Wa,-mfpu=softvfp+vfp) | 10 | KBUILD_AFLAGS :=$(KBUILD_AFLAGS:-msoft-float=-Wa,-mfpu=softvfp+vfp) |
| 11 | LDFLAGS +=--no-warn-mismatch | 11 | LDFLAGS +=--no-warn-mismatch |