diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-10-30 07:35:11 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-10-30 07:35:11 -0400 |
| commit | 67577927e8d7a1f4b09b4992df640eadc6aacb36 (patch) | |
| tree | 2e9efe6b5745965faf0dcc084d4613d9356263f9 /arch/arm/mach-iop32x/em7210.c | |
| parent | 6fe4c590313133ebd5dadb769031489ff178ece1 (diff) | |
| parent | 51f00a471ce8f359627dd99aeac322947a0e491b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
drivers/mtd/mtd_blkdevs.c
Merge Grant's device-tree bits so that we can apply the subsequent fixes.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'arch/arm/mach-iop32x/em7210.c')
| -rw-r--r-- | arch/arm/mach-iop32x/em7210.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-iop32x/em7210.c b/arch/arm/mach-iop32x/em7210.c index 2bef9b6e1cc9..779f924af302 100644 --- a/arch/arm/mach-iop32x/em7210.c +++ b/arch/arm/mach-iop32x/em7210.c | |||
| @@ -203,8 +203,6 @@ static void __init em7210_init_machine(void) | |||
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | MACHINE_START(EM7210, "Lanner EM7210") | 205 | MACHINE_START(EM7210, "Lanner EM7210") |
| 206 | .phys_io = IQ31244_UART, | ||
| 207 | .io_pg_offst = ((IQ31244_UART) >> 18) & 0xfffc, | ||
| 208 | .boot_params = 0xa0000100, | 206 | .boot_params = 0xa0000100, |
| 209 | .map_io = em7210_map_io, | 207 | .map_io = em7210_map_io, |
| 210 | .init_irq = iop32x_init_irq, | 208 | .init_irq = iop32x_init_irq, |