diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
| commit | 0b019a41553a919965bb02d07d54e3e6c57a796d (patch) | |
| tree | 6e329b4159b440d2aac5200a5c07103fe261c096 /arch/arm/boot | |
| parent | 5f6878b0d22f9b93f9698f88c335007e2a3c3bbc (diff) | |
| parent | 054d5c9238f3c577ad51195c3ee7803613f322cc (diff) | |
Merge branches 'master' and 'devel' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
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 | ||