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/xtensa | |
| 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/xtensa')
| -rw-r--r-- | arch/xtensa/boot/Makefile | 2 | ||||
| -rw-r--r-- | arch/xtensa/boot/lib/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile index 40aa55b485be..70fd1453e172 100644 --- a/arch/xtensa/boot/Makefile +++ b/arch/xtensa/boot/Makefile | |||
| @@ -14,7 +14,7 @@ HOSTFLAGS += -Iarch/$(ARCH)/boot/include | |||
| 14 | 14 | ||
| 15 | BIG_ENDIAN := $(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#") | 15 | BIG_ENDIAN := $(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#") |
| 16 | 16 | ||
| 17 | export EXTRA_CFLAGS | 17 | export ccflags-y |
| 18 | export BIG_ENDIAN | 18 | export BIG_ENDIAN |
| 19 | 19 | ||
| 20 | subdir-y := lib | 20 | subdir-y := lib |
diff --git a/arch/xtensa/boot/lib/Makefile b/arch/xtensa/boot/lib/Makefile index d3d2aa2d883a..ad8952e8a07f 100644 --- a/arch/xtensa/boot/lib/Makefile +++ b/arch/xtensa/boot/lib/Makefile | |||
| @@ -6,7 +6,7 @@ zlib := inffast.c inflate.c inftrees.c | |||
| 6 | 6 | ||
| 7 | lib-y += $(zlib:.c=.o) zmem.o | 7 | lib-y += $(zlib:.c=.o) zmem.o |
| 8 | 8 | ||
| 9 | EXTRA_CFLAGS += -Ilib/zlib_inflate | 9 | ccflags-y := -Ilib/zlib_inflate |
| 10 | 10 | ||
| 11 | quiet_cmd_copy_zlib = COPY $@ | 11 | quiet_cmd_copy_zlib = COPY $@ |
| 12 | cmd_copy_zlib = cat $< > $@ | 12 | cmd_copy_zlib = cat $< > $@ |