diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-07 12:08:27 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-07-07 12:08:27 +0200 |
| commit | 717cb906bd43a9ac00631d600adda5c6546843a6 (patch) | |
| tree | f41b250e9e0fa1e664f002fa9c4608d94527f2f2 /arch/arm/mach-imx/mx1ads.c | |
| parent | drm: Add via unichrome support (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | linux-717cb906bd43a9ac00631d600adda5c6546843a6.tar.xz linux-717cb906bd43a9ac00631d600adda5c6546843a6.zip | |
Merge ../linux-2.6/
Diffstat (limited to 'arch/arm/mach-imx/mx1ads.c')
| -rw-r--r-- | arch/arm/mach-imx/mx1ads.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c index 625dd01c2578..5d25434d332c 100644 --- a/arch/arm/mach-imx/mx1ads.c +++ b/arch/arm/mach-imx/mx1ads.c @@ -78,11 +78,13 @@ mx1ads_map_io(void) } MACHINE_START(MX1ADS, "Motorola MX1ADS") - MAINTAINER("Sascha Hauer, Pengutronix") - BOOT_MEM(0x08000000, 0x00200000, 0xe0200000) - BOOT_PARAMS(0x08000100) - MAPIO(mx1ads_map_io) - INITIRQ(imx_init_irq) + /* Maintainer: Sascha Hauer, Pengutronix */ + .phys_ram = 0x08000000, + .phys_io = 0x00200000, + .io_pg_offst = ((0xe0200000) >> 18) & 0xfffc, + .boot_params = 0x08000100, + .map_io = mx1ads_map_io, + .init_irq = imx_init_irq, .timer = &imx_timer, - INIT_MACHINE(mx1ads_init) + .init_machine = mx1ads_init, MACHINE_END |