aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-netx/nxdkn.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-12-27 17:45:51 -0500
committerArnd Bergmann <arnd@arndb.de>2011-12-27 17:45:51 -0500
commite5570bbc9c06634cfac94e06ac1432b53d8595e5 (patch)
treebfaf6b5ddedaa03d31400b25b25cfaa3bd0c9107 /arch/arm/mach-netx/nxdkn.c
parent5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff)
parent6cc04a4420391c3f034afe8ea6e28d75912a70a3 (diff)
Merge branch 'for-3.3/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/soc
Diffstat (limited to 'arch/arm/mach-netx/nxdkn.c')
-rw-r--r--arch/arm/mach-netx/nxdkn.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-netx/nxdkn.c b/arch/arm/mach-netx/nxdkn.c
index c63384aba500..588558bdd800 100644
--- a/arch/arm/mach-netx/nxdkn.c
+++ b/arch/arm/mach-netx/nxdkn.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
@@ -96,6 +97,7 @@ MACHINE_START(NXDKN, "Hilscher nxdkn")
96 .atag_offset = 0x100, 97 .atag_offset = 0x100,
97 .map_io = netx_map_io, 98 .map_io = netx_map_io,
98 .init_irq = netx_init_irq, 99 .init_irq = netx_init_irq,
100 .handle_irq = vic_handle_irq,
99 .timer = &netx_timer, 101 .timer = &netx_timer,
100 .init_machine = nxdkn_init, 102 .init_machine = nxdkn_init,
101MACHINE_END 103MACHINE_END