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-ep93xx/adssphere.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-ep93xx/adssphere.c')
| -rw-r--r-- | arch/arm/mach-ep93xx/adssphere.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c index f744f676783f..61b98ce4b673 100644 --- a/arch/arm/mach-ep93xx/adssphere.c +++ b/arch/arm/mach-ep93xx/adssphere.c | |||
| @@ -33,8 +33,6 @@ static void __init adssphere_init_machine(void) | |||
| 33 | 33 | ||
| 34 | MACHINE_START(ADSSPHERE, "ADS Sphere board") | 34 | MACHINE_START(ADSSPHERE, "ADS Sphere board") |
| 35 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 35 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
| 36 | .phys_io = EP93XX_APB_PHYS_BASE, | ||
| 37 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | ||
| 38 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, | 36 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
| 39 | .map_io = ep93xx_map_io, | 37 | .map_io = ep93xx_map_io, |
| 40 | .init_irq = ep93xx_init_irq, | 38 | .init_irq = ep93xx_init_irq, |