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

This commit is contained in:
Arnd Bergmann 2011-12-08 15:52:23 +00:00
commit 073c460311

View File

@ -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