diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-08 19:56:37 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-08 19:56:37 -0500 |
| commit | 04cf399640b7acfa9abe2eb7900cd934db8af697 (patch) | |
| tree | f9a055f2f0170550f5f0b0507b06ffce8d98945d /arch/arm/mach-orion5x/mss2-setup.c | |
| parent | 17f0056e6a2f3d1818801705f5e12b71217bf4ef (diff) | |
| parent | a0e86bd4252519321b0d102dc4ed90557aa7bee9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/mach-orion5x/mss2-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/mss2-setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c index 6020e26b1c71..65faaa34de61 100644 --- a/arch/arm/mach-orion5x/mss2-setup.c +++ b/arch/arm/mach-orion5x/mss2-setup.c | |||
| @@ -267,5 +267,6 @@ MACHINE_START(MSS2, "Maxtor Shared Storage II") | |||
| 267 | .init_early = orion5x_init_early, | 267 | .init_early = orion5x_init_early, |
| 268 | .init_irq = orion5x_init_irq, | 268 | .init_irq = orion5x_init_irq, |
| 269 | .timer = &orion5x_timer, | 269 | .timer = &orion5x_timer, |
| 270 | .fixup = tag_fixup_mem32 | 270 | .fixup = tag_fixup_mem32, |
| 271 | .restart = orion5x_restart, | ||
| 271 | MACHINE_END | 272 | MACHINE_END |