diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-06 03:42:55 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-06 03:42:55 -0500 |
| commit | 71d8c5b11e3b5936ae6c2e0b1dd6f5c78b305b65 (patch) | |
| tree | c815434adc34cb7274ef6a0ee16cf8491fa0c03e /arch/arm/mach-orion5x/terastation_pro2-setup.c | |
| parent | 0fff6b9a4e0aba233a2ff644316d29b0cb784e33 (diff) | |
| parent | 53936c56dcaf1db818fe953ae05592a8b5e345b5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
Diffstat (limited to 'arch/arm/mach-orion5x/terastation_pro2-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/terastation_pro2-setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/terastation_pro2-setup.c b/arch/arm/mach-orion5x/terastation_pro2-setup.c index 4403fae5ab0..5653ee6c71d 100644 --- a/arch/arm/mach-orion5x/terastation_pro2-setup.c +++ b/arch/arm/mach-orion5x/terastation_pro2-setup.c | |||
| @@ -361,6 +361,7 @@ MACHINE_START(TERASTATION_PRO2, "Buffalo Terastation Pro II/Live") | |||
| 361 | .boot_params = 0x00000100, | 361 | .boot_params = 0x00000100, |
| 362 | .init_machine = tsp2_init, | 362 | .init_machine = tsp2_init, |
| 363 | .map_io = orion5x_map_io, | 363 | .map_io = orion5x_map_io, |
| 364 | .init_early = orion5x_init_early, | ||
| 364 | .init_irq = orion5x_init_irq, | 365 | .init_irq = orion5x_init_irq, |
| 365 | .timer = &orion5x_timer, | 366 | .timer = &orion5x_timer, |
| 366 | .fixup = tag_fixup_mem32, | 367 | .fixup = tag_fixup_mem32, |