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-dove/dove-db-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-dove/dove-db-setup.c')
| -rw-r--r-- | arch/arm/mach-dove/dove-db-setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-dove/dove-db-setup.c b/arch/arm/mach-dove/dove-db-setup.c index 95925aa76dd9..2ac34ecfa745 100644 --- a/arch/arm/mach-dove/dove-db-setup.c +++ b/arch/arm/mach-dove/dove-db-setup.c | |||
| @@ -97,6 +97,7 @@ MACHINE_START(DOVE_DB, "Marvell DB-MV88AP510-BP Development Board") | |||
| 97 | .boot_params = 0x00000100, | 97 | .boot_params = 0x00000100, |
| 98 | .init_machine = dove_db_init, | 98 | .init_machine = dove_db_init, |
| 99 | .map_io = dove_map_io, | 99 | .map_io = dove_map_io, |
| 100 | .init_early = dove_init_early, | ||
| 100 | .init_irq = dove_init_irq, | 101 | .init_irq = dove_init_irq, |
| 101 | .timer = &dove_timer, | 102 | .timer = &dove_timer, |
| 102 | MACHINE_END | 103 | MACHINE_END |