diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:31:35 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:03 -0500 |
| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch) | |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a /arch/arm/mach-kirkwood/netxbig_v2-setup.c | |
| parent | 24056f525051a9e186af28904b396320e18bf9a0 (diff) | |
| parent | 15095bb0fe779c0403091bda7adce5fb3bb9ca35 (diff) | |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
Diffstat (limited to 'arch/arm/mach-kirkwood/netxbig_v2-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/netxbig_v2-setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/netxbig_v2-setup.c index a1b45d501aef..93afd3c8bfd8 100644 --- a/arch/arm/mach-kirkwood/netxbig_v2-setup.c +++ b/arch/arm/mach-kirkwood/netxbig_v2-setup.c | |||
| @@ -403,7 +403,7 @@ MACHINE_START(NET2BIG_V2, "LaCie 2Big Network v2") | |||
| 403 | .init_machine = netxbig_v2_init, | 403 | .init_machine = netxbig_v2_init, |
| 404 | .map_io = kirkwood_map_io, | 404 | .map_io = kirkwood_map_io, |
| 405 | .init_irq = kirkwood_init_irq, | 405 | .init_irq = kirkwood_init_irq, |
| 406 | .timer = &lacie_v2_timer, | 406 | .timer = &kirkwood_timer, |
| 407 | MACHINE_END | 407 | MACHINE_END |
| 408 | #endif | 408 | #endif |
| 409 | 409 | ||
| @@ -413,6 +413,6 @@ MACHINE_START(NET5BIG_V2, "LaCie 5Big Network v2") | |||
| 413 | .init_machine = netxbig_v2_init, | 413 | .init_machine = netxbig_v2_init, |
| 414 | .map_io = kirkwood_map_io, | 414 | .map_io = kirkwood_map_io, |
| 415 | .init_irq = kirkwood_init_irq, | 415 | .init_irq = kirkwood_init_irq, |
| 416 | .timer = &lacie_v2_timer, | 416 | .timer = &kirkwood_timer, |
| 417 | MACHINE_END | 417 | MACHINE_END |
| 418 | #endif | 418 | #endif |