diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/arm/mach-netx/nxdkn.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/arm/mach-netx/nxdkn.c')
| -rw-r--r-- | arch/arm/mach-netx/nxdkn.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-netx/nxdkn.c b/arch/arm/mach-netx/nxdkn.c index 15b54c62d60f..d775cbe07278 100644 --- a/arch/arm/mach-netx/nxdkn.c +++ b/arch/arm/mach-netx/nxdkn.c | |||
| @@ -93,8 +93,6 @@ static void __init nxdkn_init(void) | |||
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | MACHINE_START(NXDKN, "Hilscher nxdkn") | 95 | MACHINE_START(NXDKN, "Hilscher nxdkn") |
| 96 | .phys_io = 0x00100000, | ||
| 97 | .io_pg_offst = (io_p2v(0x00100000) >> 18) & 0xfffc, | ||
| 98 | .boot_params = 0x80000100, | 96 | .boot_params = 0x80000100, |
| 99 | .map_io = netx_map_io, | 97 | .map_io = netx_map_io, |
| 100 | .init_irq = netx_init_irq, | 98 | .init_irq = netx_init_irq, |