diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:10:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:10:25 -0400 |
| commit | f165eb77f49cb6f6e86e2f2f09183904b2965d19 (patch) | |
| tree | db166579758930f52a1a625eb872bd96bd7ff88e /arch/arm/boot | |
| parent | fc1caf6eafb30ea185720e29f7f5eccca61ecd60 (diff) | |
| parent | a6cd7eb374647b572ae9e7dbfe49871e6996e8e0 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Conflicts:
arch/arm/mach-pxa/palmt5.c
arch/arm/mach-pxa/palmtreo.c
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/compressed/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 7636c9b3f9a7..68775e33476c 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile | |||
| @@ -33,7 +33,7 @@ ifeq ($(CONFIG_CPU_XSCALE),y) | |||
| 33 | OBJS += head-xscale.o | 33 | OBJS += head-xscale.o |
| 34 | endif | 34 | endif |
| 35 | 35 | ||
| 36 | ifeq ($(CONFIG_PXA_SHARPSL),y) | 36 | ifeq ($(CONFIG_PXA_SHARPSL_DETECT_MACH_ID),y) |
| 37 | OBJS += head-sharpsl.o | 37 | OBJS += head-sharpsl.o |
| 38 | endif | 38 | endif |
| 39 | 39 | ||