diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-07 06:08:27 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-07-07 06:08:27 -0400 |
| commit | 717cb906bd43a9ac00631d600adda5c6546843a6 (patch) | |
| tree | f41b250e9e0fa1e664f002fa9c4608d94527f2f2 /arch/arm/mach-lh7a40x/arch-kev7a400.c | |
| parent | 22f579c621e2f264e6d093b07d75f99bc97d5df2 (diff) | |
| parent | c101f3136cc98a003d0d16be6fab7d0d950581a6 (diff) | |
Merge ../linux-2.6/
Diffstat (limited to 'arch/arm/mach-lh7a40x/arch-kev7a400.c')
| -rw-r--r-- | arch/arm/mach-lh7a40x/arch-kev7a400.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-lh7a40x/arch-kev7a400.c b/arch/arm/mach-lh7a40x/arch-kev7a400.c index be5d17fe9dcb..cb3dcd3bd00a 100644 --- a/arch/arm/mach-lh7a40x/arch-kev7a400.c +++ b/arch/arm/mach-lh7a40x/arch-kev7a400.c | |||
| @@ -102,10 +102,12 @@ void __init lh7a40x_init_board_irq (void) | |||
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | MACHINE_START (KEV7A400, "Sharp KEV7a400") | 104 | MACHINE_START (KEV7A400, "Sharp KEV7a400") |
| 105 | MAINTAINER ("Marc Singer") | 105 | /* Maintainer: Marc Singer */ |
| 106 | BOOT_MEM (0xc0000000, 0x80000000, io_p2v (0x80000000)) | 106 | .phys_ram = 0xc0000000, |
| 107 | BOOT_PARAMS (0xc0000100) | 107 | .phys_io = 0x80000000, |
| 108 | MAPIO (kev7a400_map_io) | 108 | .io_pg_offst = ((io_p2v (0x80000000))>>18) & 0xfffc, |
| 109 | INITIRQ (lh7a400_init_irq) | 109 | .boot_params = 0xc0000100, |
| 110 | .map_io = kev7a400_map_io, | ||
| 111 | .init_irq = lh7a400_init_irq, | ||
| 110 | .timer = &lh7a40x_timer, | 112 | .timer = &lh7a40x_timer, |
| 111 | MACHINE_END | 113 | MACHINE_END |