Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / drivers / net / fec_8xx / fec_main.c

diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c
index 282b1452c39a6fe795fd965da351a3d5d895939b..e17a1449ee105366dcb0caccc703216edd7ee537 100644 (file)
--- a/drivers/net/fec_8xx/fec_main.c
+++ b/drivers/net/fec_8xx/fec_main.c
@@ -30,6 +30,7 @@
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/bitops.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/8xx_immap.h>
 #include <asm/pgtable.h>
@@ -37,7 +38,6 @@
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/commproc.h>
-#include <asm/dma-mapping.h>
 
 #include "fec_8xx.h"
 
@@ -1034,20 +1034,20 @@ static void fec_set_msglevel(struct net_device *dev, __u32 value)
        fep->msg_enable = value;
 }
 
-static struct ethtool_ops fec_ethtool_ops = {
-       .get_drvinfo = fec_get_drvinfo,
-       .get_regs_len = fec_get_regs_len,
-       .get_settings = fec_get_settings,
-       .set_settings = fec_set_settings,
-       .nway_reset = fec_nway_reset,
-       .get_link = ethtool_op_get_link,
-       .get_msglevel = fec_get_msglevel,
-       .set_msglevel = fec_set_msglevel,
-       .get_tx_csum = ethtool_op_get_tx_csum,
-       .set_tx_csum = ethtool_op_set_tx_csum,  /* local! */
-       .get_sg = ethtool_op_get_sg,
-       .set_sg = ethtool_op_set_sg,
-       .get_regs = fec_get_regs,
+static const struct ethtool_ops fec_ethtool_ops = {
+       .get_drvinfo    = fec_get_drvinfo,
+       .get_regs_len   = fec_get_regs_len,
+       .get_settings   = fec_get_settings,
+       .set_settings   = fec_set_settings,
+       .nway_reset     = fec_nway_reset,
+       .get_link       = ethtool_op_get_link,
+       .get_msglevel   = fec_get_msglevel,
+       .set_msglevel   = fec_set_msglevel,
+       .get_tx_csum    = ethtool_op_get_tx_csum,
+       .set_tx_csum    = ethtool_op_set_tx_csum,       /* local! */
+       .get_sg         = ethtool_op_get_sg,
+       .set_sg         = ethtool_op_set_sg,
+       .get_regs       = fec_get_regs,
 };
 
 static int fec_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)