diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:16:29 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:16:29 -0500 |
| commit | dcf7ec5ee62a78123057a1e286c88ca739717409 (patch) | |
| tree | fa3f19434638a942ba66d236dde4d9aaadf8b370 /arch/arm/mach-mmp/teton_bga.c | |
| parent | 15db3e823c3246e3bd31fe454f5c8927eb85caf2 (diff) | |
| parent | 142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6 (diff) | |
Merge branch 'samsung/driver' into next/drivers
Conflicts:
arch/arm/mach-mxs/include/mach/common.h
Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mmp/teton_bga.c')
| -rw-r--r-- | arch/arm/mach-mmp/teton_bga.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mmp/teton_bga.c b/arch/arm/mach-mmp/teton_bga.c index 703de85b571c..0523e422990e 100644 --- a/arch/arm/mach-mmp/teton_bga.c +++ b/arch/arm/mach-mmp/teton_bga.c | |||
| @@ -87,4 +87,5 @@ MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform") | |||
| 87 | .init_irq = pxa168_init_irq, | 87 | .init_irq = pxa168_init_irq, |
| 88 | .timer = &pxa168_timer, | 88 | .timer = &pxa168_timer, |
| 89 | .init_machine = teton_bga_init, | 89 | .init_machine = teton_bga_init, |
| 90 | .restart = pxa168_restart, | ||
| 90 | MACHINE_END | 91 | MACHINE_END |