diff options
| author | Eric Anholt | 2010-08-02 04:23:53 +0200 |
|---|---|---|
| committer | Eric Anholt | 2010-08-02 04:34:47 +0200 |
| commit | 2bd34f6ca86b5a5f9b749624f73310820e7a93fd (patch) | |
| tree | 9e42100423e78f400412dfa974a6a13bac94d2c0 /arch/arm/boot/compressed/Makefile | |
| parent | agp/intel: Add actual definitions of the Sandybridge PTE caching bits. (diff) | |
| parent | Linux 2.6.35 (diff) | |
| download | kernel-qcow2-linux-2bd34f6ca86b5a5f9b749624f73310820e7a93fd.tar.gz kernel-qcow2-linux-2bd34f6ca86b5a5f9b749624f73310820e7a93fd.tar.xz kernel-qcow2-linux-2bd34f6ca86b5a5f9b749624f73310820e7a93fd.zip | |
Merge remote branch 'origin/master' into drm-intel-next
This resolves the conflict in the EDP code, which has been rather
popular to hack on recently.
Conflicts:
drivers/gpu/drm/i915/intel_dp.c
Diffstat (limited to 'arch/arm/boot/compressed/Makefile')
| -rw-r--r-- | arch/arm/boot/compressed/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 53faa9063a03..864a002137fe 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -71,6 +71,9 @@ targets := vmlinux vmlinux.lds \ piggy.$(suffix_y) piggy.$(suffix_y).o \ font.o font.c head.o misc.o $(OBJS) +# Make sure files are removed during clean +extra-y += piggy.gzip piggy.lzo piggy.lzma lib1funcs.S + ifeq ($(CONFIG_FUNCTION_TRACER),y) ORIG_CFLAGS := $(KBUILD_CFLAGS) KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) |