Commit 073c4603 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

parents b981f980 c564a0cb

arch/arm/mach-sa1100/Makefile.boot

+2 −2
Original line number Original line Diff line number Diff line 
ifeq ($(CONFIG_ARCH_SA1100),y)

ifeq ($(CONFIG_SA1111),y)

   zreladdr-$(CONFIG_SA1111)		+= 0xc0208000

   zreladdr-y	+= 0xc0208000

else

else

   zreladdr-y	+= 0xc0008000

   zreladdr-y	+= 0xc0008000

endif

endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE