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/jikos/hid
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c64xx
/
mach-ncp.c
diff --git
a/arch/arm/mach-s3c64xx/mach-ncp.c
b/arch/arm/mach-s3c64xx/mach-ncp.c
index
01c6857
..
c30f2e5
100644
(file)
--- a/
arch/arm/mach-s3c64xx/mach-ncp.c
+++ b/
arch/arm/mach-s3c64xx/mach-ncp.c
@@
-97,7
+97,7
@@
static void __init ncp_machine_init(void)
MACHINE_START(NCP, "NCP")
/* Maintainer: Samsung Electronics */
- .
boot_params = S3C64XX_PA_SDRAM +
0x100,
+ .
atag_offset =
0x100,
.init_irq = s3c6410_init_irq,
.map_io = ncp_map_io,
.init_machine = ncp_machine_init,