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-clps711x/ceiva.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-clps711x/ceiva.c')
| -rw-r--r-- | arch/arm/mach-clps711x/ceiva.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-clps711x/ceiva.c b/arch/arm/mach-clps711x/ceiva.c index 8ada20184978..16481cf3e931 100644 --- a/arch/arm/mach-clps711x/ceiva.c +++ b/arch/arm/mach-clps711x/ceiva.c | |||
| @@ -56,8 +56,6 @@ static void __init ceiva_map_io(void) | |||
| 56 | 56 | ||
| 57 | MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame") | 57 | MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame") |
| 58 | /* Maintainer: Rob Scott */ | 58 | /* Maintainer: Rob Scott */ |
| 59 | .phys_io = 0x80000000, | ||
| 60 | .io_pg_offst = ((0xff000000) >> 18) & 0xfffc, | ||
| 61 | .boot_params = 0xc0000100, | 59 | .boot_params = 0xc0000100, |
| 62 | .map_io = ceiva_map_io, | 60 | .map_io = ceiva_map_io, |
| 63 | .init_irq = clps711x_init_irq, | 61 | .init_irq = clps711x_init_irq, |