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-s3c2440/mach-nexcoder.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-s3c2440/mach-nexcoder.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-nexcoder.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2440/mach-nexcoder.c b/arch/arm/mach-s3c2440/mach-nexcoder.c index 3ff62de45fde..37dd306fb7dc 100644 --- a/arch/arm/mach-s3c2440/mach-nexcoder.c +++ b/arch/arm/mach-s3c2440/mach-nexcoder.c | |||
| @@ -151,8 +151,6 @@ static void __init nexcoder_init(void) | |||
| 151 | 151 | ||
| 152 | MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440") | 152 | MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440") |
| 153 | /* Maintainer: Guillaume GOURAT <guillaume.gourat@nexvision.tv> */ | 153 | /* Maintainer: Guillaume GOURAT <guillaume.gourat@nexvision.tv> */ |
| 154 | .phys_io = S3C2410_PA_UART, | ||
| 155 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, | ||
| 156 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 154 | .boot_params = S3C2410_SDRAM_PA + 0x100, |
| 157 | .map_io = nexcoder_map_io, | 155 | .map_io = nexcoder_map_io, |
| 158 | .init_machine = nexcoder_init, | 156 | .init_machine = nexcoder_init, |