Merge branch 'ec' into release

[sfrench/cifs-2.6.git] / arch / arm / mach-mx3 / qong.c

diff --git a/arch/arm/mach-mx3/qong.c b/arch/arm/mach-mx3/qong.c
index 82b31c4ab11fc620fd28ea41e2065ed1ce197dba..044511f1b9a99152613430fa846f41ad169fc2fd 100644 (file)
--- 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