diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
| commit | 2e0e943436912ffe0848ece58167edfe754edb96 (patch) | |
| tree | b91919095c74742fa06e2105db6d859bee39b2b4 /arch/arm/mach-netx/nxdb500.c | |
| parent | a32737e1ca650504f172292dd344eb64c02311f3 (diff) | |
| parent | ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'arch/arm/mach-netx/nxdb500.c')
| -rw-r--r-- | arch/arm/mach-netx/nxdb500.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-netx/nxdb500.c b/arch/arm/mach-netx/nxdb500.c index 90903dd44cb..ef8cf3574a0 100644 --- a/arch/arm/mach-netx/nxdb500.c +++ b/arch/arm/mach-netx/nxdb500.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <mach/hardware.h> | 28 | #include <mach/hardware.h> |
| 29 | #include <asm/mach-types.h> | 29 | #include <asm/mach-types.h> |
| 30 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
| 31 | #include <asm/hardware/vic.h> | ||
| 31 | #include <mach/netx-regs.h> | 32 | #include <mach/netx-regs.h> |
| 32 | #include <mach/eth.h> | 33 | #include <mach/eth.h> |
| 33 | 34 | ||
| @@ -203,6 +204,7 @@ MACHINE_START(NXDB500, "Hilscher nxdb500") | |||
| 203 | .atag_offset = 0x100, | 204 | .atag_offset = 0x100, |
| 204 | .map_io = netx_map_io, | 205 | .map_io = netx_map_io, |
| 205 | .init_irq = netx_init_irq, | 206 | .init_irq = netx_init_irq, |
| 207 | .handle_irq = vic_handle_irq, | ||
| 206 | .timer = &netx_timer, | 208 | .timer = &netx_timer, |
| 207 | .init_machine = nxdb500_init, | 209 | .init_machine = nxdb500_init, |
| 208 | MACHINE_END | 210 | MACHINE_END |