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-s3c2410
/
Makefile.boot
diff --git
a/arch/arm/mach-s3c2410/Makefile.boot
b/arch/arm/mach-s3c2410/Makefile.boot
index
58c1dd7
..
4457605
100644
(file)
--- a/
arch/arm/mach-s3c2410/Makefile.boot
+++ b/
arch/arm/mach-s3c2410/Makefile.boot
@@
-1,7
+1,7
@@
ifeq ($(CONFIG_PM_H1940),y)
- zreladdr-y
:
= 0x30108000
+ zreladdr-y
+
= 0x30108000
params_phys-y := 0x30100100
else
- zreladdr-y
:
= 0x30008000
+ zreladdr-y
+
= 0x30008000
params_phys-y := 0x30000100
endif