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 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-gemini
/
Makefile.boot
diff --git
a/arch/arm/mach-gemini/Makefile.boot
b/arch/arm/mach-gemini/Makefile.boot
index
22a52c2
..
683f52b
100644
(file)
--- a/
arch/arm/mach-gemini/Makefile.boot
+++ b/
arch/arm/mach-gemini/Makefile.boot
@@
-1,9
+1,9
@@
ifeq ($(CONFIG_GEMINI_MEM_SWAP),y)
ifeq ($(CONFIG_GEMINI_MEM_SWAP),y)
- zreladdr-y
:
= 0x00008000
+ zreladdr-y
+
= 0x00008000
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000
else
params_phys-y := 0x00000100
initrd_phys-y := 0x00800000
else
- zreladdr-y
:
= 0x10008000
+ zreladdr-y
+
= 0x10008000
params_phys-y := 0x10000100
initrd_phys-y := 0x10800000
endif
params_phys-y := 0x10000100
initrd_phys-y := 0x10800000
endif