Merge tag 'r8169-20060920-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux...

[pandora-kernel.git] / drivers / net / sunqe.c

diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index 9da6d5b..9202a1c 100644 (file)
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -451,7 +451,7 @@ static void qe_rx(struct sunqe *qep)
                }
                end_rxd->rx_addr = this_qbuf_dvma;
                end_rxd->rx_flags = (RXD_OWN | ((RXD_PKT_SZ) & RXD_LENGTH));
-               
+
                elem = NEXT_RX(elem);
                this = &rxbase[elem];
        }
@@ -718,7 +718,7 @@ static u32 qe_get_link(struct net_device *dev)
        return (phyconfig & MREGS_PHYCONFIG_LSTAT);
 }
 
-static struct ethtool_ops qe_ethtool_ops = {
+static const struct ethtool_ops qe_ethtool_ops = {
        .get_drvinfo            = qe_get_drvinfo,
        .get_link               = qe_get_link,
 };
@@ -811,7 +811,7 @@ static struct sunqec * __init get_qec(struct sbus_dev *child_sdev)
                        qec_init_once(qecp, qec_sdev);
 
                        if (request_irq(qec_sdev->irqs[0], &qec_interrupt,
-                                       SA_SHIRQ, "qec", (void *) qecp)) {
+                                       IRQF_SHARED, "qec", (void *) qecp)) {
                                printk(KERN_ERR "qec: Can't register irq.\n");
                                goto fail;
                        }
@@ -858,7 +858,7 @@ static int __init qec_ether_init(struct sbus_dev *sdev)
        }
        qe->channel = i;
        spin_lock_init(&qe->lock);
-       
+
        res = -ENODEV;
        qecp = get_qec(sdev);
        if (!qecp)