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://cavan.codon.org.uk/platform-drivers-x86
[pandora-kernel.git]
/
arch
/
arm
/
mach-u300
/
Makefile.boot
diff --git
a/arch/arm/mach-u300/Makefile.boot
b/arch/arm/mach-u300/Makefile.boot
index
6fbfc6e
..
69357af
100644
(file)
--- a/
arch/arm/mach-u300/Makefile.boot
+++ b/
arch/arm/mach-u300/Makefile.boot
@@
-4,10
+4,10
@@
# INITRD_PHYS must be in RAM
ifdef CONFIG_MACH_U300_SINGLE_RAM
# INITRD_PHYS must be in RAM
ifdef CONFIG_MACH_U300_SINGLE_RAM
- zreladdr-y
:
= 0x28E08000
+ zreladdr-y
+
= 0x28E08000
params_phys-y := 0x28E00100
else
params_phys-y := 0x28E00100
else
- zreladdr-y
:
= 0x48008000
+ zreladdr-y
+
= 0x48008000
params_phys-y := 0x48000100
endif
params_phys-y := 0x48000100
endif