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 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
Makefile.boot
diff --git
a/arch/arm/mach-davinci/Makefile.boot
b/arch/arm/mach-davinci/Makefile.boot
index
db97ef2
..
04a6c4e
100644
(file)
--- a/
arch/arm/mach-davinci/Makefile.boot
+++ b/
arch/arm/mach-davinci/Makefile.boot
@@
-2,12
+2,12
@@
ifeq ($(CONFIG_ARCH_DAVINCI_DA8XX),y)
ifeq ($(CONFIG_ARCH_DAVINCI_DMx),y)
$(error Cannot enable DaVinci and DA8XX platforms concurrently)
else
ifeq ($(CONFIG_ARCH_DAVINCI_DMx),y)
$(error Cannot enable DaVinci and DA8XX platforms concurrently)
else
- zreladdr-y
:
= 0xc0008000
+ zreladdr-y
+
= 0xc0008000
params_phys-y := 0xc0000100
initrd_phys-y := 0xc0800000
endif
else
params_phys-y := 0xc0000100
initrd_phys-y := 0xc0800000
endif
else
- zreladdr-y
:
= 0x80008000
+ zreladdr-y
+
= 0x80008000
params_phys-y := 0x80000100
initrd_phys-y := 0x80800000
endif
params_phys-y := 0x80000100
initrd_phys-y := 0x80800000
endif