Commit 54bf8961 authored by David Dillow's avatar David Dillow

Merge thedillows.org:/space/il1/linus-2.5

into thedillows.org:/space/il1/typhoon-merge/typhoon-2.5-merge
parents 1255448c a0306224
...@@ -90,6 +90,12 @@ M: Philip.Blundell@pobox.com ...@@ -90,6 +90,12 @@ M: Philip.Blundell@pobox.com
L: linux-net@vger.kernel.org L: linux-net@vger.kernel.org
S: Maintained S: Maintained
3CR990 NETWORK DRIVER
P: David Dillow
M: dave@thedillows.org
L: linux-net@vger.kernel.org
S: Maintained
53C700 AND 53C700-66 SCSI DRIVER 53C700 AND 53C700-66 SCSI DRIVER
P: James E.J. Bottomley P: James E.J. Bottomley
M: James.Bottomley@HansenPartnership.com M: James.Bottomley@HansenPartnership.com
......
...@@ -745,6 +745,26 @@ config VORTEX ...@@ -745,6 +745,26 @@ config VORTEX
say M here and read <file:Documentation/modules.txt> as well as say M here and read <file:Documentation/modules.txt> as well as
<file:Documentation/networking/net-modules.txt>. <file:Documentation/networking/net-modules.txt>.
config TYPHOON
tristate "3cr990 series \"Typhoon\" support"
depends on NET_VENDOR_3COM && PCI
---help---
This option enables driver support for the 3cr990 series of cards:
3C990-TX, 3CR990-TX-95, 3CR990-TX-97, 3CR990-FX-95, 3CR990-FX-97,
3CR990SVR, 3CR990SVR95, 3CR990SVR97, 3CR990-FX-95 Server,
3CR990-FX-97 Server, 3C990B-TX-M, 3C990BSVR
If you have a network (Ethernet) card of this type, say Y and read
the Ethernet-HOWTO, available from
<http://www.linuxdoc.org/docs.html#howto>.
This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will be called typhoon.o. If you want to compile it as a
module, say M here and read <file:Documentation/modules.txt> as well
as <file:Documentation/networking/net-modules.txt>.
config LANCE config LANCE
tristate "AMD LANCE and PCnet (AT1500 and NE2100) support" tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
depends on NET_ETHERNET && ISA depends on NET_ETHERNET && ISA
......
...@@ -33,6 +33,7 @@ obj-$(CONFIG_OAKNET) += oaknet.o 8390.o ...@@ -33,6 +33,7 @@ obj-$(CONFIG_OAKNET) += oaknet.o 8390.o
obj-$(CONFIG_DGRS) += dgrs.o obj-$(CONFIG_DGRS) += dgrs.o
obj-$(CONFIG_RCPCI) += rcpci.o obj-$(CONFIG_RCPCI) += rcpci.o
obj-$(CONFIG_VORTEX) += 3c59x.o obj-$(CONFIG_VORTEX) += 3c59x.o
obj-$(CONFIG_TYPHOON) += typhoon.o
obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
obj-$(CONFIG_PCNET32) += pcnet32.o mii.o obj-$(CONFIG_PCNET32) += pcnet32.o mii.o
obj-$(CONFIG_EEPRO100) += eepro100.o mii.o obj-$(CONFIG_EEPRO100) += eepro100.o mii.o
......
...@@ -33,6 +33,7 @@ obj-$(CONFIG_SUNGEM) += crc32.o ...@@ -33,6 +33,7 @@ obj-$(CONFIG_SUNGEM) += crc32.o
obj-$(CONFIG_SUNLANCE) += crc32.o obj-$(CONFIG_SUNLANCE) += crc32.o
obj-$(CONFIG_SUNQE) += crc32.o obj-$(CONFIG_SUNQE) += crc32.o
obj-$(CONFIG_TULIP) += crc32.o obj-$(CONFIG_TULIP) += crc32.o
obj-$(CONFIG_TYPHOON) += crc32.o
obj-$(CONFIG_VIA_RHINE) += crc32.o obj-$(CONFIG_VIA_RHINE) += crc32.o
obj-$(CONFIG_YELLOWFIN) += crc32.o obj-$(CONFIG_YELLOWFIN) += crc32.o
obj-$(CONFIG_WINBOND_840) += crc32.o obj-$(CONFIG_WINBOND_840) += crc32.o
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
...@@ -893,6 +893,14 @@ ...@@ -893,6 +893,14 @@
#define PCI_DEVICE_ID_3COM_3C905TX 0x9050 #define PCI_DEVICE_ID_3COM_3C905TX 0x9050
#define PCI_DEVICE_ID_3COM_3C905T4 0x9051 #define PCI_DEVICE_ID_3COM_3C905T4 0x9051
#define PCI_DEVICE_ID_3COM_3C905B_TX 0x9055 #define PCI_DEVICE_ID_3COM_3C905B_TX 0x9055
#define PCI_DEVICE_ID_3COM_3CR990 0x9900
#define PCI_DEVICE_ID_3COM_3CR990_TX_95 0x9902
#define PCI_DEVICE_ID_3COM_3CR990_TX_97 0x9903
#define PCI_DEVICE_ID_3COM_3CR990B 0x9904
#define PCI_DEVICE_ID_3COM_3CR990_FX 0x9905
#define PCI_DEVICE_ID_3COM_3CR990SVR95 0x9908
#define PCI_DEVICE_ID_3COM_3CR990SVR97 0x9909
#define PCI_DEVICE_ID_3COM_3CR990SVR 0x990a
#define PCI_VENDOR_ID_SMC 0x10b8 #define PCI_VENDOR_ID_SMC 0x10b8
#define PCI_DEVICE_ID_SMC_EPIC100 0x0005 #define PCI_DEVICE_ID_SMC_EPIC100 0x0005
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment