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

073c4603 · Arnd Bergmann · b981f980 · c564a0cb · 073c4603
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

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

未找到文件。
--- a/arch/arm/mach-sa1100/Makefile.boot
+++ b/arch/arm/mach-sa1100/Makefile.boot
-ifeq ($(CONFIG_ARCH_SA1100),y)
-   zreladdr-$(CONFIG_SA1111)		+= 0xc0208000
+ifeq ($(CONFIG_SA1111),y)
+   zreladdr-y	+= 0xc0208000
 else
   zreladdr-y	+= 0xc0008000
 endif