diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:08:10 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:08:10 -0400 |
| commit | 08cab72f91c8b28ffabfd143119bccdd4a115ad7 (patch) | |
| tree | ccd5583971caecd82bf2d1e62691bf6e0362d650 /arch/arm/mach-w90x900/mach-nuc910evb.c | |
| parent | 86c1e5a74af11e4817ffa6d7748d9ac1353b5b53 (diff) | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff) | |
Merge branch 'dt/gic' into next/dt
Conflicts:
arch/arm/include/asm/localtimer.h
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-omap2/board-generic.c
Diffstat (limited to 'arch/arm/mach-w90x900/mach-nuc910evb.c')
| -rw-r--r-- | arch/arm/mach-w90x900/mach-nuc910evb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-w90x900/mach-nuc910evb.c b/arch/arm/mach-w90x900/mach-nuc910evb.c index 30fccde94fb..31c10901822 100644 --- a/arch/arm/mach-w90x900/mach-nuc910evb.c +++ b/arch/arm/mach-w90x900/mach-nuc910evb.c | |||
| @@ -34,7 +34,6 @@ static void __init nuc910evb_init(void) | |||
| 34 | 34 | ||
| 35 | MACHINE_START(W90P910EVB, "W90P910EVB") | 35 | MACHINE_START(W90P910EVB, "W90P910EVB") |
| 36 | /* Maintainer: Wan ZongShun */ | 36 | /* Maintainer: Wan ZongShun */ |
| 37 | .boot_params = 0, | ||
| 38 | .map_io = nuc910evb_map_io, | 37 | .map_io = nuc910evb_map_io, |
| 39 | .init_irq = nuc900_init_irq, | 38 | .init_irq = nuc900_init_irq, |
| 40 | .init_machine = nuc910evb_init, | 39 | .init_machine = nuc910evb_init, |