This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/net/sk_mca.c b/drivers/net/sk_mca.c
index ef640f9..2039f22 100644 (file)
--- a/drivers/net/sk_mca.c
+++ b/drivers/net/sk_mca.c
@@ -97,9 +97,9 @@ History:
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
-#include <linux/bitops.h>
 
 #include <asm/processor.h>
+#include <asm/bitops.h>
 #include <asm/io.h>
 
 #define _SK_MCA_DRIVER_
@@ -972,6 +972,14 @@ static struct net_device_stats *skmca_stats(struct net_device *dev)
        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. */
 
@@ -1139,6 +1147,7 @@ struct net_device * __init skmca_probe(int unit)
        /* 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;