aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/Kconfig138
-rw-r--r--drivers/net/Makefile7
-rw-r--r--drivers/net/ethernet/3com/3c501.c (renamed from drivers/net/3c501.c)0
-rw-r--r--drivers/net/ethernet/3com/3c501.h (renamed from drivers/net/3c501.h)0
-rw-r--r--drivers/net/ethernet/3com/3c509.c (renamed from drivers/net/3c509.c)0
-rw-r--r--drivers/net/ethernet/3com/3c515.c (renamed from drivers/net/3c515.c)0
-rw-r--r--drivers/net/ethernet/3com/3c574_cs.c (renamed from drivers/net/pcmcia/3c574_cs.c)0
-rw-r--r--drivers/net/ethernet/3com/3c589_cs.c (renamed from drivers/net/pcmcia/3c589_cs.c)0
-rw-r--r--drivers/net/ethernet/3com/3c59x.c (renamed from drivers/net/3c59x.c)0
-rw-r--r--drivers/net/ethernet/3com/Kconfig147
-rw-r--r--drivers/net/ethernet/3com/Makefile12
-rw-r--r--drivers/net/ethernet/3com/acenic.c (renamed from drivers/net/acenic.c)0
-rw-r--r--drivers/net/ethernet/3com/acenic.h (renamed from drivers/net/acenic.h)0
-rw-r--r--drivers/net/ethernet/3com/typhoon.c (renamed from drivers/net/typhoon.c)0
-rw-r--r--drivers/net/ethernet/3com/typhoon.h (renamed from drivers/net/typhoon.h)0
-rw-r--r--drivers/net/ethernet/Kconfig2
-rw-r--r--drivers/net/ethernet/Makefile2
-rw-r--r--drivers/net/pcmcia/Kconfig18
-rw-r--r--drivers/net/pcmcia/Makefile2
19 files changed, 173 insertions, 155 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5b95796942db..0b3ea213b610 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -616,38 +616,11 @@ config SUNVNET
616 help 616 help
617 Support for virtual network devices under Sun Logical Domains. 617 Support for virtual network devices under Sun Logical Domains.
618 618
619config NET_VENDOR_3COM
620 bool "3COM cards"
621 depends on ISA || EISA || MCA || PCI
622 help
623 If you have a network (Ethernet) card belonging to this class, say Y
624 and read the Ethernet-HOWTO, available from
625 <http://www.tldp.org/docs.html#howto>.
626
627 Note that the answer to this question doesn't directly affect the
628 kernel: saying N will just cause the configurator to skip all
629 the questions about 3COM cards. If you say Y, you will be asked for
630 your specific card in the following questions.
631
632config EL1
633 tristate "3c501 \"EtherLink\" support"
634 depends on NET_VENDOR_3COM && ISA
635 ---help---
636 If you have a network (Ethernet) card of this type, say Y and read
637 the Ethernet-HOWTO, available from
638 <http://www.tldp.org/docs.html#howto>. Also, consider buying a
639 new card, since the 3c501 is slow, broken, and obsolete: you will
640 have problems. Some people suggest to ping ("man ping") a nearby
641 machine every minute ("man cron") when using this card.
642
643 To compile this driver as a module, choose M here. The module
644 will be called 3c501.
645
646config EL2 619config EL2
647 tristate "3c503 \"EtherLink II\" support" 620 tristate "3c503 \"EtherLink II\" support"
648 depends on NET_VENDOR_3COM && ISA 621 depends on ISA
649 select CRC32 622 select CRC32
650 help 623 ---help---
651 If you have a network (Ethernet) card of this type, say Y and read 624 If you have a network (Ethernet) card of this type, say Y and read
652 the Ethernet-HOWTO, available from 625 the Ethernet-HOWTO, available from
653 <http://www.tldp.org/docs.html#howto>. 626 <http://www.tldp.org/docs.html#howto>.
@@ -657,7 +630,7 @@ config EL2
657 630
658config ELPLUS 631config ELPLUS
659 tristate "3c505 \"EtherLink Plus\" support" 632 tristate "3c505 \"EtherLink Plus\" support"
660 depends on NET_VENDOR_3COM && ISA && ISA_DMA_API 633 depends on ISA && ISA_DMA_API
661 ---help--- 634 ---help---
662 Information about this network (Ethernet) card can be found in 635 Information about this network (Ethernet) card can be found in
663 <file:Documentation/networking/3c505.txt>. If you have a card of 636 <file:Documentation/networking/3c505.txt>. If you have a card of
@@ -669,8 +642,8 @@ config ELPLUS
669 642
670config EL16 643config EL16
671 tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)" 644 tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)"
672 depends on NET_VENDOR_3COM && ISA && EXPERIMENTAL 645 depends on ISA && EXPERIMENTAL
673 help 646 ---help---
674 If you have a network (Ethernet) card of this type, say Y and read 647 If you have a network (Ethernet) card of this type, say Y and read
675 the Ethernet-HOWTO, available from 648 the Ethernet-HOWTO, available from
676 <http://www.tldp.org/docs.html#howto>. 649 <http://www.tldp.org/docs.html#howto>.
@@ -678,36 +651,10 @@ config EL16
678 To compile this driver as a module, choose M here. The module 651 To compile this driver as a module, choose M here. The module
679 will be called 3c507. 652 will be called 3c507.
680 653
681config EL3
682 tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
683 depends on NET_VENDOR_3COM && (ISA || EISA || MCA)
684 ---help---
685 If you have a network (Ethernet) card belonging to the 3Com
686 EtherLinkIII series, say Y and read the Ethernet-HOWTO, available
687 from <http://www.tldp.org/docs.html#howto>.
688
689 If your card is not working you may need to use the DOS
690 setup disk to disable Plug & Play mode, and to select the default
691 media type.
692
693 To compile this driver as a module, choose M here. The module
694 will be called 3c509.
695
696config 3C515
697 tristate "3c515 ISA \"Fast EtherLink\""
698 depends on NET_VENDOR_3COM && (ISA || EISA) && ISA_DMA_API
699 help
700 If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
701 network card, say Y and read the Ethernet-HOWTO, available from
702 <http://www.tldp.org/docs.html#howto>.
703
704 To compile this driver as a module, choose M here. The module
705 will be called 3c515.
706
707config ELMC 654config ELMC
708 tristate "3c523 \"EtherLink/MC\" support" 655 tristate "3c523 \"EtherLink/MC\" support"
709 depends on NET_VENDOR_3COM && MCA_LEGACY 656 depends on MCA_LEGACY
710 help 657 ---help---
711 If you have a network (Ethernet) card of this type, say Y and read 658 If you have a network (Ethernet) card of this type, say Y and read
712 the Ethernet-HOWTO, available from 659 the Ethernet-HOWTO, available from
713 <http://www.tldp.org/docs.html#howto>. 660 <http://www.tldp.org/docs.html#howto>.
@@ -717,54 +664,14 @@ config ELMC
717 664
718config ELMC_II 665config ELMC_II
719 tristate "3c527 \"EtherLink/MC 32\" support (EXPERIMENTAL)" 666 tristate "3c527 \"EtherLink/MC 32\" support (EXPERIMENTAL)"
720 depends on NET_VENDOR_3COM && MCA && MCA_LEGACY 667 depends on MCA && MCA_LEGACY
721 help
722 If you have a network (Ethernet) card of this type, say Y and read
723 the Ethernet-HOWTO, available from
724 <http://www.tldp.org/docs.html#howto>.
725
726 To compile this driver as a module, choose M here. The module
727 will be called 3c527.
728
729config VORTEX
730 tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support"
731 depends on NET_VENDOR_3COM && (PCI || EISA)
732 select MII
733 ---help---
734 This option enables driver support for a large number of 10Mbps and
735 10/100Mbps EISA, PCI and PCMCIA 3Com network cards:
736
737 "Vortex" (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI
738 "Boomerang" (EtherLink XL 3c900 or 3c905) PCI
739 "Cyclone" (3c540/3c900/3c905/3c980/3c575/3c656) PCI and Cardbus
740 "Tornado" (3c905) PCI
741 "Hurricane" (3c555/3cSOHO) PCI
742
743 If you have such a card, say Y and read the Ethernet-HOWTO,
744 available from <http://www.tldp.org/docs.html#howto>. More
745 specific information is in
746 <file:Documentation/networking/vortex.txt> and in the comments at
747 the beginning of <file:drivers/net/3c59x.c>.
748
749 To compile this support as a module, choose M here.
750
751config TYPHOON
752 tristate "3cr990 series \"Typhoon\" support"
753 depends on NET_VENDOR_3COM && PCI
754 select CRC32
755 ---help--- 668 ---help---
756 This option enables driver support for the 3cr990 series of cards:
757
758 3C990-TX, 3CR990-TX-95, 3CR990-TX-97, 3CR990-FX-95, 3CR990-FX-97,
759 3CR990SVR, 3CR990SVR95, 3CR990SVR97, 3CR990-FX-95 Server,
760 3CR990-FX-97 Server, 3C990B-TX-M, 3C990BSVR
761
762 If you have a network (Ethernet) card of this type, say Y and read 669 If you have a network (Ethernet) card of this type, say Y and read
763 the Ethernet-HOWTO, available from 670 the Ethernet-HOWTO, available from
764 <http://www.tldp.org/docs.html#howto>. 671 <http://www.tldp.org/docs.html#howto>.
765 672
766 To compile this driver as a module, choose M here. The module 673 To compile this driver as a module, choose M here. The module
767 will be called typhoon. 674 will be called 3c527.
768 675
769config LANCE 676config LANCE
770 tristate "AMD LANCE and PCnet (AT1500 and NE2100) support" 677 tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
@@ -2046,33 +1953,6 @@ menuconfig NETDEV_1000
2046 1953
2047if NETDEV_1000 1954if NETDEV_1000
2048 1955
2049config ACENIC
2050 tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
2051 depends on PCI
2052 ---help---
2053 Say Y here if you have an Alteon AceNIC, 3Com 3C985(B), NetGear
2054 GA620, SGI Gigabit or Farallon PN9000-SX PCI Gigabit Ethernet
2055 adapter. The driver allows for using the Jumbo Frame option (9000
2056 bytes/frame) however it requires that your switches can handle this
2057 as well. To enable Jumbo Frames, add `mtu 9000' to your ifconfig
2058 line.
2059
2060 To compile this driver as a module, choose M here: the
2061 module will be called acenic.
2062
2063config ACENIC_OMIT_TIGON_I
2064 bool "Omit support for old Tigon I based AceNICs"
2065 depends on ACENIC
2066 help
2067 Say Y here if you only have Tigon II based AceNICs and want to leave
2068 out support for the older Tigon I based cards which are no longer
2069 being sold (ie. the original Alteon AceNIC and 3Com 3C985 (non B
2070 version)). This will reduce the size of the driver object by
2071 app. 100KB. If you are not sure whether your card is a Tigon I or a
2072 Tigon II, say N here.
2073
2074 The safe and default value for this is N.
2075
2076config DL2K 1956config DL2K
2077 tristate "DL2000/TC902x-based Gigabit Ethernet support" 1957 tristate "DL2000/TC902x-based Gigabit Ethernet support"
2078 depends on PCI 1958 depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 670b5141f0d7..d4d6744ab607 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -66,8 +66,6 @@ obj-$(CONFIG_SUNVNET) += sunvnet.o
66obj-$(CONFIG_MACE) += mace.o 66obj-$(CONFIG_MACE) += mace.o
67obj-$(CONFIG_BMAC) += bmac.o 67obj-$(CONFIG_BMAC) += bmac.o
68 68
69obj-$(CONFIG_VORTEX) += 3c59x.o
70obj-$(CONFIG_TYPHOON) += typhoon.o
71obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o 69obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
72obj-$(CONFIG_PCNET32) += pcnet32.o 70obj-$(CONFIG_PCNET32) += pcnet32.o
73obj-$(CONFIG_E100) += e100.o 71obj-$(CONFIG_E100) += e100.o
@@ -78,7 +76,6 @@ obj-$(CONFIG_SIS190) += sis190.o
78obj-$(CONFIG_SIS900) += sis900.o 76obj-$(CONFIG_SIS900) += sis900.o
79obj-$(CONFIG_R6040) += r6040.o 77obj-$(CONFIG_R6040) += r6040.o
80obj-$(CONFIG_YELLOWFIN) += yellowfin.o 78obj-$(CONFIG_YELLOWFIN) += yellowfin.o
81obj-$(CONFIG_ACENIC) += acenic.o
82obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o 79obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
83obj-$(CONFIG_NATSEMI) += natsemi.o 80obj-$(CONFIG_NATSEMI) += natsemi.o
84obj-$(CONFIG_NS83820) += ns83820.o 81obj-$(CONFIG_NS83820) += ns83820.o
@@ -187,13 +184,10 @@ obj-$(CONFIG_DEFXX) += defxx.o
187obj-$(CONFIG_SGISEEQ) += sgiseeq.o 184obj-$(CONFIG_SGISEEQ) += sgiseeq.o
188obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o 185obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
189obj-$(CONFIG_AT1700) += at1700.o 186obj-$(CONFIG_AT1700) += at1700.o
190obj-$(CONFIG_EL1) += 3c501.o
191obj-$(CONFIG_EL16) += 3c507.o 187obj-$(CONFIG_EL16) += 3c507.o
192obj-$(CONFIG_ELMC) += 3c523.o 188obj-$(CONFIG_ELMC) += 3c523.o
193obj-$(CONFIG_IBMLANA) += ibmlana.o 189obj-$(CONFIG_IBMLANA) += ibmlana.o
194obj-$(CONFIG_ELMC_II) += 3c527.o 190obj-$(CONFIG_ELMC_II) += 3c527.o
195obj-$(CONFIG_EL3) += 3c509.o
196obj-$(CONFIG_3C515) += 3c515.o
197obj-$(CONFIG_EEXPRESS) += eexpress.o 191obj-$(CONFIG_EEXPRESS) += eexpress.o
198obj-$(CONFIG_EEXPRESS_PRO) += eepro.o 192obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
199obj-$(CONFIG_8139CP) += 8139cp.o 193obj-$(CONFIG_8139CP) += 8139cp.o
@@ -269,6 +263,7 @@ obj-$(CONFIG_S6GMAC) += s6gmac.o
269 263
270obj-$(CONFIG_ARM) += arm/ 264obj-$(CONFIG_ARM) += arm/
271obj-$(CONFIG_DEV_APPLETALK) += appletalk/ 265obj-$(CONFIG_DEV_APPLETALK) += appletalk/
266obj-$(CONFIG_ETHERNET) += ethernet/
272obj-$(CONFIG_TR) += tokenring/ 267obj-$(CONFIG_TR) += tokenring/
273obj-$(CONFIG_WAN) += wan/ 268obj-$(CONFIG_WAN) += wan/
274obj-$(CONFIG_ARCNET) += arcnet/ 269obj-$(CONFIG_ARCNET) += arcnet/
diff --git a/drivers/net/3c501.c b/drivers/net/ethernet/3com/3c501.c
index 5420f6de27df..5420f6de27df 100644
--- a/drivers/net/3c501.c
+++ b/drivers/net/ethernet/3com/3c501.c
diff --git a/drivers/net/3c501.h b/drivers/net/ethernet/3com/3c501.h
index 183fd55f03cb..183fd55f03cb 100644
--- a/drivers/net/3c501.h
+++ b/drivers/net/ethernet/3com/3c501.h
diff --git a/drivers/net/3c509.c b/drivers/net/ethernet/3com/3c509.c
index 44b28b2d7003..44b28b2d7003 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/ethernet/3com/3c509.c
diff --git a/drivers/net/3c515.c b/drivers/net/ethernet/3com/3c515.c
index d2bb4b254c57..d2bb4b254c57 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/ethernet/3com/3c515.c
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/ethernet/3com/3c574_cs.c
index 34c5e1cbf65d..34c5e1cbf65d 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/ethernet/3com/3c574_cs.c
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c
index 4a1a35809807..4a1a35809807 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/ethernet/3com/3c589_cs.c
diff --git a/drivers/net/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index 8cc22568ebd3..8cc22568ebd3 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig
new file mode 100644
index 000000000000..497f038dcd47
--- /dev/null
+++ b/drivers/net/ethernet/3com/Kconfig
@@ -0,0 +1,147 @@
1#
2# 3Com Ethernet device configuration
3#
4
5config NET_VENDOR_3COM
6 bool "3Com devices"
7 depends on ISA || EISA || MCA || PCI || PCMCIA
8 ---help---
9 If you have a network (Ethernet) card belonging to this class, say Y
10 and read the Ethernet-HOWTO, available from
11 <http://www.tldp.org/docs.html#howto>.
12
13 Note that the answer to this question doesn't directly affect the
14 kernel: saying N will just cause the configurator to skip all
15 the questions about 3Com cards. If you say Y, you will be asked for
16 your specific card in the following questions.
17
18if NET_VENDOR_3COM
19
20config EL1
21 tristate "3c501 \"EtherLink\" support"
22 depends on ISA
23 ---help---
24 If you have a network (Ethernet) card of this type, say Y and read
25 the Ethernet-HOWTO, available from
26 <http://www.tldp.org/docs.html#howto>. Also, consider buying a
27 new card, since the 3c501 is slow, broken, and obsolete: you will
28 have problems. Some people suggest to ping ("man ping") a nearby
29 machine every minute ("man cron") when using this card.
30
31 To compile this driver as a module, choose M here. The module
32 will be called 3c501.
33
34config EL3
35 tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
36 depends on (ISA || EISA || MCA)
37 ---help---
38 If you have a network (Ethernet) card belonging to the 3Com
39 EtherLinkIII series, say Y and read the Ethernet-HOWTO, available
40 from <http://www.tldp.org/docs.html#howto>.
41
42 If your card is not working you may need to use the DOS
43 setup disk to disable Plug & Play mode, and to select the default
44 media type.
45
46 To compile this driver as a module, choose M here. The module
47 will be called 3c509.
48
49config 3C515
50 tristate "3c515 ISA \"Fast EtherLink\""
51 depends on (ISA || EISA) && ISA_DMA_API
52 ---help---
53 If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
54 network card, say Y and read the Ethernet-HOWTO, available from
55 <http://www.tldp.org/docs.html#howto>.
56
57 To compile this driver as a module, choose M here. The module
58 will be called 3c515.
59
60config PCMCIA_3C574
61 tristate "3Com 3c574 PCMCIA support"
62 depends on PCMCIA
63 ---help---
64 Say Y here if you intend to attach a 3Com 3c574 or compatible PCMCIA
65 (PC-card) Fast Ethernet card to your computer.
66
67 To compile this driver as a module, choose M here: the module will be
68 called 3c574_cs. If unsure, say N.
69
70config PCMCIA_3C589
71 tristate "3Com 3c589 PCMCIA support"
72 depends on PCMCIA
73 ---help---
74 Say Y here if you intend to attach a 3Com 3c589 or compatible PCMCIA
75 (PC-card) Ethernet card to your computer.
76
77 To compile this driver as a module, choose M here: the module will be
78 called 3c589_cs. If unsure, say N.
79
80config VORTEX
81 tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support"
82 depends on (PCI || EISA)
83 select MII
84 ---help---
85 This option enables driver support for a large number of 10Mbps and
86 10/100Mbps EISA, PCI and PCMCIA 3Com network cards:
87
88 "Vortex" (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI
89 "Boomerang" (EtherLink XL 3c900 or 3c905) PCI
90 "Cyclone" (3c540/3c900/3c905/3c980/3c575/3c656) PCI and Cardbus
91 "Tornado" (3c905) PCI
92 "Hurricane" (3c555/3cSOHO) PCI
93
94 If you have such a card, say Y and read the Ethernet-HOWTO,
95 available from <http://www.tldp.org/docs.html#howto>. More
96 specific information is in
97 <file:Documentation/networking/vortex.txt> and in the comments at
98 the beginning of <file:drivers/net/3c59x.c>.
99
100 To compile this support as a module, choose M here.
101
102config TYPHOON
103 tristate "3cr990 series \"Typhoon\" support"
104 depends on PCI
105 select CRC32
106 ---help---
107 This option enables driver support for the 3cr990 series of cards:
108
109 3C990-TX, 3CR990-TX-95, 3CR990-TX-97, 3CR990-FX-95, 3CR990-FX-97,
110 3CR990SVR, 3CR990SVR95, 3CR990SVR97, 3CR990-FX-95 Server,
111 3CR990-FX-97 Server, 3C990B-TX-M, 3C990BSVR
112
113 If you have a network (Ethernet) card of this type, say Y and read
114 the Ethernet-HOWTO, available from
115 <http://www.tldp.org/docs.html#howto>.
116
117 To compile this driver as a module, choose M here. The module
118 will be called typhoon.
119
120config ACENIC
121 tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
122 depends on PCI
123 ---help---
124 Say Y here if you have an Alteon AceNIC, 3Com 3C985(B), NetGear
125 GA620, SGI Gigabit or Farallon PN9000-SX PCI Gigabit Ethernet
126 adapter. The driver allows for using the Jumbo Frame option (9000
127 bytes/frame) however it requires that your switches can handle this
128 as well. To enable Jumbo Frames, add `mtu 9000' to your ifconfig
129 line.
130
131 To compile this driver as a module, choose M here: the
132 module will be called acenic.
133
134config ACENIC_OMIT_TIGON_I
135 bool "Omit support for old Tigon I based AceNICs"
136 depends on ACENIC
137 ---help---
138 Say Y here if you only have Tigon II based AceNICs and want to leave
139 out support for the older Tigon I based cards which are no longer
140 being sold (ie. the original Alteon AceNIC and 3Com 3C985 (non B
141 version)). This will reduce the size of the driver object by
142 app. 100KB. If you are not sure whether your card is a Tigon I or a
143 Tigon II, say N here.
144
145 The safe and default value for this is N.
146
147endif # NET_VENDOR_3COM
diff --git a/drivers/net/ethernet/3com/Makefile b/drivers/net/ethernet/3com/Makefile
new file mode 100644
index 000000000000..96d1d60d67b6
--- /dev/null
+++ b/drivers/net/ethernet/3com/Makefile
@@ -0,0 +1,12 @@
1#
2# Makefile for the 3Com Ethernet device drivers
3#
4
5obj-$(CONFIG_EL1) += 3c501.o
6obj-$(CONFIG_EL3) += 3c509.o
7obj-$(CONFIG_3C515) += 3c515.o
8obj-$(CONFIG_PCMCIA_3C589) += 3c589_cs.o
9obj-$(CONFIG_PCMCIA_3C574) += 3c574_cs.o
10obj-$(CONFIG_VORTEX) += 3c59x.o
11obj-$(CONFIG_ACENIC) += acenic.o
12obj-$(CONFIG_TYPHOON) += typhoon.o
diff --git a/drivers/net/acenic.c b/drivers/net/ethernet/3com/acenic.c
index 31798f5f5d06..31798f5f5d06 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/ethernet/3com/acenic.c
diff --git a/drivers/net/acenic.h b/drivers/net/ethernet/3com/acenic.h
index 51c486cfbb8c..51c486cfbb8c 100644
--- a/drivers/net/acenic.h
+++ b/drivers/net/ethernet/3com/acenic.h
diff --git a/drivers/net/typhoon.c b/drivers/net/ethernet/3com/typhoon.c
index 1d5091a1e49a..1d5091a1e49a 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/ethernet/3com/typhoon.c
diff --git a/drivers/net/typhoon.h b/drivers/net/ethernet/3com/typhoon.h
index 88187fc84aa3..88187fc84aa3 100644
--- a/drivers/net/typhoon.h
+++ b/drivers/net/ethernet/3com/typhoon.h
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index d59e4f2aa93f..18193ecd8cb6 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -11,4 +11,6 @@ menuconfig ETHERNET
11 11
12if ETHERNET 12if ETHERNET
13 13
14source "drivers/net/ethernet/3com/Kconfig"
15
14endif # ETHERNET 16endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 0d21dda32038..07766baf7920 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -1,3 +1,5 @@
1# 1#
2# Makefile for the Linux network Ethernet device drivers. 2# Makefile for the Linux network Ethernet device drivers.
3# 3#
4
5obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index 9b8f793b1cc8..b67c5ed00f1b 100644
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -21,24 +21,6 @@ menuconfig NET_PCMCIA
21 21
22if NET_PCMCIA && PCMCIA 22if NET_PCMCIA && PCMCIA
23 23
24config PCMCIA_3C589
25 tristate "3Com 3c589 PCMCIA support"
26 help
27 Say Y here if you intend to attach a 3Com 3c589 or compatible PCMCIA
28 (PC-card) Ethernet card to your computer.
29
30 To compile this driver as a module, choose M here: the module will be
31 called 3c589_cs. If unsure, say N.
32
33config PCMCIA_3C574
34 tristate "3Com 3c574 PCMCIA support"
35 help
36 Say Y here if you intend to attach a 3Com 3c574 or compatible PCMCIA
37 (PC-card) Fast Ethernet card to your computer.
38
39 To compile this driver as a module, choose M here: the module will be
40 called 3c574_cs. If unsure, say N.
41
42config PCMCIA_FMVJ18X 24config PCMCIA_FMVJ18X
43 tristate "Fujitsu FMV-J18x PCMCIA support" 25 tristate "Fujitsu FMV-J18x PCMCIA support"
44 select CRC32 26 select CRC32
diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile
index 87d2d99f4c14..2f2ab3bc028a 100644
--- a/drivers/net/pcmcia/Makefile
+++ b/drivers/net/pcmcia/Makefile
@@ -3,8 +3,6 @@
3# 3#
4 4
5# 16-bit client drivers 5# 16-bit client drivers
6obj-$(CONFIG_PCMCIA_3C589) += 3c589_cs.o
7obj-$(CONFIG_PCMCIA_3C574) += 3c574_cs.o
8obj-$(CONFIG_PCMCIA_FMVJ18X) += fmvj18x_cs.o 6obj-$(CONFIG_PCMCIA_FMVJ18X) += fmvj18x_cs.o
9obj-$(CONFIG_PCMCIA_NMCLAN) += nmclan_cs.o 7obj-$(CONFIG_PCMCIA_NMCLAN) += nmclan_cs.o
10obj-$(CONFIG_PCMCIA_PCNET) += pcnet_cs.o 8obj-$(CONFIG_PCMCIA_PCNET) += pcnet_cs.o
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-28 06:04:45 -0500