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-u300/u300.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-u300/u300.c')
-rw-r--r-- | arch/arm/mach-u300/u300.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-u300/u300.c b/arch/arm/mach-u300/u300.c index bfcda9820888..48b3b7f39966 100644 --- a/arch/arm/mach-u300/u300.c +++ b/arch/arm/mach-u300/u300.c | |||
@@ -19,9 +19,9 @@ | |||
19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
20 | #include <mach/hardware.h> | 20 | #include <mach/hardware.h> |
21 | #include <mach/platform.h> | 21 | #include <mach/platform.h> |
22 | #include <mach/memory.h> | ||
23 | #include <asm/mach-types.h> | 22 | #include <asm/mach-types.h> |
24 | #include <asm/mach/arch.h> | 23 | #include <asm/mach/arch.h> |
24 | #include <asm/memory.h> | ||
25 | 25 | ||
26 | static void __init u300_reserve(void) | 26 | static void __init u300_reserve(void) |
27 | { | 27 | { |
@@ -61,8 +61,6 @@ static void __init u300_init_machine(void) | |||
61 | 61 | ||
62 | MACHINE_START(U300, MACH_U300_STRING) | 62 | MACHINE_START(U300, MACH_U300_STRING) |
63 | /* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */ | 63 | /* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */ |
64 | .phys_io = U300_AHB_PER_PHYS_BASE, | ||
65 | .io_pg_offst = ((U300_AHB_PER_VIRT_BASE) >> 18) & 0xfffc, | ||
66 | .boot_params = BOOT_PARAMS_OFFSET, | 64 | .boot_params = BOOT_PARAMS_OFFSET, |
67 | .map_io = u300_map_io, | 65 | .map_io = u300_map_io, |
68 | .reserve = u300_reserve, | 66 | .reserve = u300_reserve, |