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-mx3/mach-mx31lite.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-mx3/mach-mx31lite.c')
| -rw-r--r-- | arch/arm/mach-mx3/mach-mx31lite.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-mx3/mach-mx31lite.c b/arch/arm/mach-mx3/mach-mx31lite.c index f66a9576d8c2..b93895814cdf 100644 --- a/arch/arm/mach-mx3/mach-mx31lite.c +++ b/arch/arm/mach-mx3/mach-mx31lite.c | |||
| @@ -282,8 +282,6 @@ struct sys_timer mx31lite_timer = { | |||
| 282 | 282 | ||
| 283 | MACHINE_START(MX31LITE, "LogicPD i.MX31 SOM") | 283 | MACHINE_START(MX31LITE, "LogicPD i.MX31 SOM") |
| 284 | /* Maintainer: Freescale Semiconductor, Inc. */ | 284 | /* Maintainer: Freescale Semiconductor, Inc. */ |
| 285 | .phys_io = MX31_AIPS1_BASE_ADDR, | ||
| 286 | .io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc, | ||
| 287 | .boot_params = MX3x_PHYS_OFFSET + 0x100, | 285 | .boot_params = MX3x_PHYS_OFFSET + 0x100, |
| 288 | .map_io = mx31lite_map_io, | 286 | .map_io = mx31lite_map_io, |
| 289 | .init_irq = mx31_init_irq, | 287 | .init_irq = mx31_init_irq, |