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

073c4603 · Arnd Bergmann · b981f980 · c564a0cb · 073c4603
Commit 073c4603 authored Dec 08, 2011 by Arnd Bergmann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

arch/arm/mach-sa1100/Makefile.boot arch/arm/mach-sa1100/Makefile.boot +2 -2

No files found.
--- a/arch/arm/mach-sa1100/Makefile.boot
+++ b/arch/arm/mach-sa1100/Makefile.boot
-ifeq ($(CONFIG_ARCH_SA1100),y)
+ifeq ($(CONFIG_SA1111),y)
-   zreladdr-$(CONFIG_SA1111)		+= 0xc0208000
+   zreladdr-y	+= 0xc0208000
 else
   zreladdr-y	+= 0xc0008000
 endif