aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-12-08 15:52:23 +0000
committerArnd Bergmann <arnd@arndb.de>2011-12-08 15:52:23 +0000
commit073c460311662eff7beb429de21acdbf7d90a4cb (patch)
treed5cd52a6112739d55c2928c7b435fecf8eab0b75 /arch
parentb981f980b068617e021736eb19092919fc7d0e53 (diff)
parentc564a0cb9d0c7f4ac50f1e9ca8bc67fd66cd550f (diff)
downloadvexpress-lsk-073c460311662eff7beb429de21acdbf7d90a4cb.tar.gz
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-sa1100/Makefile.boot4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/Makefile.boot b/arch/arm/mach-sa1100/Makefile.boot
index 5a616f6e561..f7951aa0456 100644
--- a/arch/arm/mach-sa1100/Makefile.boot
+++ b/arch/arm/mach-sa1100/Makefile.boot
@@ -1,5 +1,5 @@
-ifeq ($(CONFIG_ARCH_SA1100),y)
- zreladdr-$(CONFIG_SA1111) += 0xc0208000
+ifeq ($(CONFIG_SA1111),y)
+ zreladdr-y += 0xc0208000
else
zreladdr-y += 0xc0008000
endif