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/boot | |
| 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/boot')
| -rw-r--r-- | arch/arm/boot/compressed/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index f9f77c65dff3..8ebbb511c783 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile | |||
| @@ -95,8 +95,8 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS) | |||
| 95 | KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) | 95 | KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) |
| 96 | endif | 96 | endif |
| 97 | 97 | ||
| 98 | EXTRA_CFLAGS := -fpic -fno-builtin | 98 | ccflags-y := -fpic -fno-builtin |
| 99 | EXTRA_AFLAGS := -Wa,-march=all | 99 | asflags-y := -Wa,-march=all |
| 100 | 100 | ||
| 101 | # Provide size of uncompressed kernel to the decompressor via a linker symbol. | 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) | 102 | LDFLAGS_vmlinux = --defsym _image_size=$(shell stat -c "%s" $(obj)/../Image) |