diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 07:44:37 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 15:40:51 -0500 |
| commit | b001befe58691ef3627458cd814e8cee7f845c5f (patch) | |
| tree | 1083f1a1cd3feeceeac4b395534df0ff032fdbc8 /arch/arm/mach-w90x900/mach-nuc910evb.c | |
| parent | 31b2a868451d630bacfdeddc626371b3f9d9a01c (diff) | |
| parent | 928a11ba36f999436915ea2b1eadf54301f93059 (diff) | |
Merge branch 'samsung/dt' into next/dt
* samsung/dt: (3 commit)
Merge branch 'depends/rmk/for-linus' into samsung/dt
Merge branch 'depends/rmk/restart' into next/cleanup
Merge branch 'next/cleanup' into samsung/dt
Conflicts:
arch/arm/mach-tegra/board-dt.c
arch/arm/mach-tegra/include/mach/entry-macro.S
The latest version of the samsung/dt branch resolves
all sorts of conflicts with the latest upstream, no functional
changes that are not already there.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-w90x900/mach-nuc910evb.c')
| -rw-r--r-- | arch/arm/mach-w90x900/mach-nuc910evb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-w90x900/mach-nuc910evb.c b/arch/arm/mach-w90x900/mach-nuc910evb.c index 31c109018228..b4243e4f1565 100644 --- a/arch/arm/mach-w90x900/mach-nuc910evb.c +++ b/arch/arm/mach-w90x900/mach-nuc910evb.c | |||
| @@ -38,4 +38,5 @@ MACHINE_START(W90P910EVB, "W90P910EVB") | |||
| 38 | .init_irq = nuc900_init_irq, | 38 | .init_irq = nuc900_init_irq, |
| 39 | .init_machine = nuc910evb_init, | 39 | .init_machine = nuc910evb_init, |
| 40 | .timer = &nuc900_timer, | 40 | .timer = &nuc900_timer, |
| 41 | .restart = nuc9xx_restart, | ||
| 41 | MACHINE_END | 42 | MACHINE_END |