Re: 2.3.51 cardbus

From: willy@thepuffingroup.com
Date: Sun Mar 12 2000 - 16:58:58 EST


> This used to be true of the old tulip_cb.c driver too. Now that there is
> just one tulip.c driver, the issue is moot. You can compile it in, and in
> theory you can have a machine with both a CardBus tulip card and a regular
> PCI card with the tulip chipset and they'll both be serviced by the same
> driver.

Does that mean that drivers/net/pcmcia/tulip_cb.c should be deleted?
Something along these lines:

rm drivers/net/pcmcia.tulip_cb.c
followed by patch:

diff -urNX ../exclude linux-2.3.51/Documentation/Configure.help linux-2.3.51-new/Documentation/Configure.help
--- linux-2.3.51/Documentation/Configure.help Sun Mar 12 12:03:44 2000
+++ linux-2.3.51-new/Documentation/Configure.help Sun Mar 12 16:21:56 2000
@@ -6185,16 +6185,6 @@
   The module will be called 3c575_cb.o. If you want to do that, say M
   here and read Documentation/modules.txt. If unsure, say N.
 
-DEC Tulip CardBus support
-CONFIG_PCMCIA_TULIP
- This driver supports CardBus Fast Ethernet adapters based on DEC
- Tulip and compatible chipsets.
-
- This driver can only be compiled as a module ( = code which can be
- inserted in and removed from the running kernel whenever you want).
- The module will be called tulip_cb.o. If you want to do that, say M
- here and read Documentation/modules.txt. If unsure, say N.
-
 SMC EPIC CardBus support
 CONFIG_PCMCIA_EPIC100
   This driver supports CardBus Fast Ethernet adapters based on the SMC
diff -urNX ../exclude linux-2.3.51/arch/i386/defconfig linux-2.3.51-new/arch/i386/defconfig
--- linux-2.3.51/arch/i386/defconfig Sun Mar 12 12:03:44 2000
+++ linux-2.3.51-new/arch/i386/defconfig Sun Mar 12 16:24:53 2000
@@ -339,7 +339,6 @@
 # CONFIG_PCMCIA_XIRC2PS is not set
 # CONFIG_ARCNET_COM20020_CS is not set
 # CONFIG_PCMCIA_3C575 is not set
-# CONFIG_PCMCIA_TULIP is not set
 CONFIG_NET_PCMCIA_RADIO=y
 CONFIG_PCMCIA_RAYCS=y
 # CONFIG_PCMCIA_NETWAVE is not set
diff -urNX ../exclude linux-2.3.51/drivers/net/pcmcia/Config.in linux-2.3.51-new/drivers/net/pcmcia/Config.in
--- linux-2.3.51/drivers/net/pcmcia/Config.in Sun Mar 12 12:03:44 2000
+++ linux-2.3.51-new/drivers/net/pcmcia/Config.in Sun Mar 12 16:22:54 2000
@@ -18,7 +18,6 @@
 
    if [ "$CONFIG_CARDBUS" = "y" ]; then
       dep_tristate ' 3Com 3c575 CardBus support' CONFIG_PCMCIA_3C575 m
- dep_tristate ' DEC Tulip CardBus support' CONFIG_PCMCIA_TULIP m
    fi
 
    bool 'Pcmcia Wireless LAN' CONFIG_NET_PCMCIA_RADIO
diff -urNX ../exclude linux-2.3.51/drivers/net/pcmcia/Makefile linux-2.3.51-new/drivers/net/pcmcia/Makefile
--- linux-2.3.51/drivers/net/pcmcia/Makefile Sun Feb 20 18:37:42 2000
+++ linux-2.3.51-new/drivers/net/pcmcia/Makefile Sun Mar 12 16:23:20 2000
@@ -20,7 +20,6 @@
 export-objs := ray_cs.o
 
 CFLAGS_3c575_cb.o = -DCARDBUS -DMODULE
-CFLAGS_tulip_cb.o = -DCARDBUS -DMODULE
 
 # 16-bit client drivers
 obj-$(CONFIG_PCMCIA_3C589) += 3c589_cs.o
@@ -40,7 +39,6 @@
 
 # Cardbus client drivers
 obj-$(CONFIG_PCMCIA_3C575) += 3c575_cb.o
-obj-$(CONFIG_PCMCIA_TULIP) += tulip_cb.o
 
 O_OBJS := $(filter-out $(export-objs), $(obj-y))
 OX_OBJS := $(filter $(export-objs), $(obj-y))

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Wed Mar 15 2000 - 21:00:22 EST