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-w90x900/mach-nuc950evb.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-w90x900/mach-nuc950evb.c')
| -rw-r--r-- | arch/arm/mach-w90x900/mach-nuc950evb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-w90x900/mach-nuc950evb.c b/arch/arm/mach-w90x900/mach-nuc950evb.c index 590c99b96dc1..4062e55a57d8 100644 --- a/arch/arm/mach-w90x900/mach-nuc950evb.c +++ b/arch/arm/mach-w90x900/mach-nuc950evb.c | |||
| @@ -37,7 +37,6 @@ static void __init nuc950evb_init(void) | |||
| 37 | 37 | ||
| 38 | MACHINE_START(W90P950EVB, "W90P950EVB") | 38 | MACHINE_START(W90P950EVB, "W90P950EVB") |
| 39 | /* Maintainer: Wan ZongShun */ | 39 | /* Maintainer: Wan ZongShun */ |
| 40 | .boot_params = 0, | ||
| 41 | .map_io = nuc950evb_map_io, | 40 | .map_io = nuc950evb_map_io, |
| 42 | .init_irq = nuc900_init_irq, | 41 | .init_irq = nuc900_init_irq, |
| 43 | .init_machine = nuc950evb_init, | 42 | .init_machine = nuc950evb_init, |