Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes

git-mirror · Dec 8, 2011 · 073c460 · 073c460
2 parents b981f98 + c564a0c
commit 073c460
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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