diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 19:25:01 -0400 |
| commit | 5725aeae5ff2e39f3815bbef788ee326c9afea2c (patch) | |
| tree | 4f32f936ba18384d48ab1e537b787a8ce666263f /arch/arm/mach-davinci/board-dm646x-evm.c | |
| parent | 43872fa788060eef91ae437957e0a5e39f1c56fd (diff) | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-davinci/board-dm646x-evm.c')
| -rw-r--r-- | arch/arm/mach-davinci/board-dm646x-evm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index 993a3146fd35..337c45e3e44d 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c | |||
| @@ -792,7 +792,7 @@ static __init void evm_init(void) | |||
| 792 | } | 792 | } |
| 793 | 793 | ||
| 794 | MACHINE_START(DAVINCI_DM6467_EVM, "DaVinci DM646x EVM") | 794 | MACHINE_START(DAVINCI_DM6467_EVM, "DaVinci DM646x EVM") |
| 795 | .boot_params = (0x80000100), | 795 | .atag_offset = 0x100, |
| 796 | .map_io = davinci_map_io, | 796 | .map_io = davinci_map_io, |
| 797 | .init_irq = davinci_irq_init, | 797 | .init_irq = davinci_irq_init, |
| 798 | .timer = &davinci_timer, | 798 | .timer = &davinci_timer, |
| @@ -801,7 +801,7 @@ MACHINE_START(DAVINCI_DM6467_EVM, "DaVinci DM646x EVM") | |||
| 801 | MACHINE_END | 801 | MACHINE_END |
| 802 | 802 | ||
| 803 | MACHINE_START(DAVINCI_DM6467TEVM, "DaVinci DM6467T EVM") | 803 | MACHINE_START(DAVINCI_DM6467TEVM, "DaVinci DM6467T EVM") |
| 804 | .boot_params = (0x80000100), | 804 | .atag_offset = 0x100, |
| 805 | .map_io = davinci_map_io, | 805 | .map_io = davinci_map_io, |
| 806 | .init_irq = davinci_irq_init, | 806 | .init_irq = davinci_irq_init, |
| 807 | .timer = &davinci_timer, | 807 | .timer = &davinci_timer, |