diff options
| author | Artem B. Bityuckiy <dedekind@infradead.org> | 2005-07-06 10:43:18 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-06 13:40:38 -0400 |
| commit | b3539219c9ea20ebf6a5ea3cc534f423a3607c41 (patch) | |
| tree | d17c31c0eac0a7290ba5011b59a100fd9e9c9532 /arch/arm/mach-pxa/lubbock.c | |
| parent | 6430a8def12edebc1c9c7c2621d33ca0e8653c33 (diff) | |
| parent | a18bcb7450840f07a772a45229de4811d930f461 (diff) | |
Merge with rsync://fileserver/linux
Update to 2.6.12-rc3
Diffstat (limited to 'arch/arm/mach-pxa/lubbock.c')
| -rw-r--r-- | arch/arm/mach-pxa/lubbock.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c index f2c9e0d2b24b..6309853b59be 100644 --- a/arch/arm/mach-pxa/lubbock.c +++ b/arch/arm/mach-pxa/lubbock.c | |||
| @@ -268,10 +268,12 @@ static void __init lubbock_map_io(void) | |||
| 268 | } | 268 | } |
| 269 | 269 | ||
| 270 | MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)") | 270 | MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)") |
| 271 | MAINTAINER("MontaVista Software Inc.") | 271 | /* Maintainer: MontaVista Software Inc. */ |
| 272 | BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000)) | 272 | .phys_ram = 0xa0000000, |
| 273 | MAPIO(lubbock_map_io) | 273 | .phys_io = 0x40000000, |
| 274 | INITIRQ(lubbock_init_irq) | 274 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
| 275 | .map_io = lubbock_map_io, | ||
| 276 | .init_irq = lubbock_init_irq, | ||
| 275 | .timer = &pxa_timer, | 277 | .timer = &pxa_timer, |
| 276 | INIT_MACHINE(lubbock_init) | 278 | .init_machine = lubbock_init, |
| 277 | MACHINE_END | 279 | MACHINE_END |