Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
This commit is contained in:
commit
073c460311
1 changed files with 2 additions and 2 deletions
|
@ -1,5 +1,5 @@
|
||||||
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
|
||||||
|
|
Loading…
Add table
Reference in a new issue