git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
Makefile.boot
diff --git
a/arch/arm/mach-sa1100/Makefile.boot
b/arch/arm/mach-sa1100/Makefile.boot
index
5a616f6
..
f7951aa
100644
(file)
--- a/
arch/arm/mach-sa1100/Makefile.boot
+++ b/
arch/arm/mach-sa1100/Makefile.boot
@@
-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