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-lh7a40x/arch-kev7a400.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-lh7a40x/arch-kev7a400.c')
| -rw-r--r-- | arch/arm/mach-lh7a40x/arch-kev7a400.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-lh7a40x/arch-kev7a400.c b/arch/arm/mach-lh7a40x/arch-kev7a400.c index 3d7bd50b9095..9088c16662e8 100644 --- a/arch/arm/mach-lh7a40x/arch-kev7a400.c +++ b/arch/arm/mach-lh7a40x/arch-kev7a400.c | |||
| @@ -111,8 +111,6 @@ void __init lh7a40x_init_board_irq (void) | |||
| 111 | 111 | ||
| 112 | MACHINE_START (KEV7A400, "Sharp KEV7a400") | 112 | MACHINE_START (KEV7A400, "Sharp KEV7a400") |
| 113 | /* Maintainer: Marc Singer */ | 113 | /* Maintainer: Marc Singer */ |
| 114 | .phys_io = 0x80000000, | ||
| 115 | .io_pg_offst = ((io_p2v (0x80000000))>>18) & 0xfffc, | ||
| 116 | .boot_params = 0xc0000100, | 114 | .boot_params = 0xc0000100, |
| 117 | .map_io = kev7a400_map_io, | 115 | .map_io = kev7a400_map_io, |
| 118 | .init_irq = lh7a400_init_irq, | 116 | .init_irq = lh7a400_init_irq, |