diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-15 16:49:31 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-15 16:49:31 +0100 |
| commit | 590a94d93475fa6cca257f161ae268ed3a2395b5 (patch) | |
| tree | d08735ef1dc8260e73f6e95832bfa90d172a7a4a /arch/arm/mach-mx3/qong.c | |
| parent | 6973ee7e602b08f624bbf7379b6f68054c71aebb (diff) | |
| parent | c35d3a418149f145ff0d90833db3e298e88de1ad (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mx3/qong.c')
| -rw-r--r-- | arch/arm/mach-mx3/qong.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-mx3/qong.c b/arch/arm/mach-mx3/qong.c index 82b31c4ab11..044511f1b9a 100644 --- a/arch/arm/mach-mx3/qong.c +++ b/arch/arm/mach-mx3/qong.c @@ -81,13 +81,12 @@ static inline void mxc_init_imx_uart(void) } static struct resource dnet_resources[] = { - [0] = { + { .name = "dnet-memory", .start = QONG_DNET_BASEADDR, .end = QONG_DNET_BASEADDR + QONG_DNET_SIZE - 1, .flags = IORESOURCE_MEM, - }, - [1] = { + }, { .start = QONG_FPGA_IRQ, .end = QONG_FPGA_IRQ, .flags = IORESOURCE_IRQ, @@ -280,7 +279,7 @@ MACHINE_START(QONG, "Dave/DENX QongEVB-LITE") .io_pg_offst = ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc, .boot_params = PHYS_OFFSET + 0x100, .map_io = mx31_map_io, - .init_irq = mxc_init_irq, + .init_irq = mx31_init_irq, .init_machine = mxc_board_init, .timer = &qong_timer, MACHINE_END |