Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / drivers / staging / netlogic / platform_net.c

diff --git a/drivers/staging/netlogic/platform_net.c b/drivers/staging/netlogic/platform_net.c
index 74e154f62c703e5ab847d2486ef9b5909716f3ad..abf4c71ee66b8b189026d762e1fa9cabeff15fad 100644 (file)
--- a/drivers/staging/netlogic/platform_net.c
+++ b/drivers/staging/netlogic/platform_net.c
@@ -122,8 +122,8 @@ static struct platform_device *gmac_controller2_init(void *gmac0_addr)
                ndata1.phy_addr[mac] = mac + 4 + 0x10;
 
                xlr_resource_init(&xlr_net1_res[mac * 2],
-                               xlr_gmac_offsets[mac + 4],
-                               xlr_gmac_irqs[mac + 4]);
+                                 xlr_gmac_offsets[mac + 4],
+                                 xlr_gmac_irqs[mac + 4]);
        }
        xlr_net_dev1.num_resources = 8;
 
@@ -170,7 +170,7 @@ static void xls_gmac_init(void)
                xlr_net_dev0.num_resources = 2;
 
                xlr_resource_init(&xlr_net0_res[0], xlr_gmac_offsets[0],
-                               xlr_gmac_irqs[0]);
+                                 xlr_gmac_irqs[0]);
                platform_device_register(&xlr_net_dev0);
 
                /* second block is XAUI, not supported yet */
@@ -183,7 +183,7 @@ static void xls_gmac_init(void)
                        ndata0.phy_addr[mac] = mac + 0x10;
 
                        xlr_resource_init(&xlr_net0_res[mac * 2],
-                                       xlr_gmac_offsets[mac],
+                                         xlr_gmac_offsets[mac],
                                        xlr_gmac_irqs[mac]);
                }
                xlr_net_dev0.num_resources = 8;
@@ -209,7 +209,6 @@ static void xlr_gmac_init(void)
                .gpio_addr      = NULL,
        };
 
-
        static struct platform_device xlr_net_dev0 = {
                .name           = "xlr-net",
                .id             = 0,
@@ -224,7 +223,7 @@ static void xlr_gmac_init(void)
                ndata0.tx_stnid[mac] = FMN_STNID_GMAC0_TX0 + mac;
                ndata0.phy_addr[mac] = mac;
                xlr_resource_init(&xlr_net0_res[mac * 2], xlr_gmac_offsets[mac],
-                               xlr_gmac_irqs[mac]);
+                                 xlr_gmac_irqs[mac]);
        }
        xlr_net_dev0.num_resources = 8;
        xlr_net_dev0.resource = xlr_net0_res;