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 'prcm_scm_misc_fixes_3.2' of git://git.pwsan.com/linux-2.6 into fixes
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
board-dm355-evm.c
diff --git
a/arch/arm/mach-davinci/board-dm355-evm.c
b/arch/arm/mach-davinci/board-dm355-evm.c
index
241a6bd
..
6556628
100644
(file)
--- a/
arch/arm/mach-davinci/board-dm355-evm.c
+++ b/
arch/arm/mach-davinci/board-dm355-evm.c
@@
-351,7
+351,7
@@
static __init void dm355_evm_init(void)
}
MACHINE_START(DAVINCI_DM355_EVM, "DaVinci DM355 EVM")
}
MACHINE_START(DAVINCI_DM355_EVM, "DaVinci DM355 EVM")
- .
boot_params = (0x80000100)
,
+ .
atag_offset = 0x100
,
.map_io = dm355_evm_map_io,
.init_irq = davinci_irq_init,
.timer = &davinci_timer,
.map_io = dm355_evm_map_io,
.init_irq = davinci_irq_init,
.timer = &davinci_timer,