vserver 1.9.5.x5

[linux-2.6.git] / drivers / net / sk_mca.c

diff --git a/drivers/net/sk_mca.c b/drivers/net/sk_mca.c
index 2d0d929..ef640f9 100644 (file)
--- a/drivers/net/sk_mca.c
+++ b/drivers/net/sk_mca.c
@@ -4,7 +4,8 @@ net-3-driver for the SKNET MCA-based cards
 This is an extension to the Linux operating system, and is covered by the
 same GNU General Public License that covers that work.
 
 This is an extension to the Linux operating system, and is covered by the
 same GNU General Public License that covers that work.
 

-Copyright 1999 by Alfred Arnold (alfred@ccac.rwth-aachen.de, aarnold@elsa.de)
+Copyright 1999 by Alfred Arnold (alfred@ccac.rwth-aachen.de,
+                                 alfred.arnold@lancom.de)

 
 This driver is based both on the 3C523 driver and the SK_G16 driver.
 
 
 This driver is based both on the 3C523 driver and the SK_G16 driver.
 


@@ -96,9 +97,9 @@ History:
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>

+#include <linux/bitops.h>

 
 #include <asm/processor.h>
 
 #include <asm/processor.h>

-#include <asm/bitops.h>

 #include <asm/io.h>
 
 #define _SK_MCA_DRIVER_
 #include <asm/io.h>
 
 #define _SK_MCA_DRIVER_


@@ -971,14 +972,6 @@ static struct net_device_stats *skmca_stats(struct net_device *dev)
        return &(priv->stat);
 }
 
        return &(priv->stat);
 }
 

-/* we don't support runtime reconfiguration, since an MCA card can
-   be unambigously identified by its POS registers. */
-
-static int skmca_config(struct net_device *dev, struct ifmap *map)
-{
-       return 0;
-}
-

 /* switch receiver mode.  We use the LANCE's multicast filter to prefilter
    multicast addresses. */
 
 /* switch receiver mode.  We use the LANCE's multicast filter to prefilter
    multicast addresses. */
 


@@ -1146,7 +1139,6 @@ struct net_device * __init skmca_probe(int unit)
        /* set methods */
        dev->open = skmca_open;
        dev->stop = skmca_close;
        /* set methods */
        dev->open = skmca_open;
        dev->stop = skmca_close;

-       dev->set_config = skmca_config;

        dev->hard_start_xmit = skmca_tx;
        dev->do_ioctl = NULL;
        dev->get_stats = skmca_stats;
        dev->hard_start_xmit = skmca_tx;
        dev->do_ioctl = NULL;
        dev->get_stats = skmca_stats;