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

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

parents b981f980 c564a0cb
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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment