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-iop33x/iq80331.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-iop33x/iq80331.c')
| -rw-r--r-- | arch/arm/mach-iop33x/iq80331.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-iop33x/iq80331.c b/arch/arm/mach-iop33x/iq80331.c index c6ff5523b380..c565f8d1e3a4 100644 --- a/arch/arm/mach-iop33x/iq80331.c +++ b/arch/arm/mach-iop33x/iq80331.c | |||
| @@ -141,8 +141,6 @@ static void __init iq80331_init_machine(void) | |||
| 141 | 141 | ||
| 142 | MACHINE_START(IQ80331, "Intel IQ80331") | 142 | MACHINE_START(IQ80331, "Intel IQ80331") |
| 143 | /* Maintainer: Intel Corp. */ | 143 | /* Maintainer: Intel Corp. */ |
| 144 | .phys_io = 0xfefff000, | ||
| 145 | .io_pg_offst = ((0xfffff000) >> 18) & 0xfffc, | ||
| 146 | .boot_params = 0x00000100, | 144 | .boot_params = 0x00000100, |
| 147 | .map_io = iop3xx_map_io, | 145 | .map_io = iop3xx_map_io, |
| 148 | .init_irq = iop33x_init_irq, | 146 | .init_irq = iop33x_init_irq, |