aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-08-13 03:37:14 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-08-13 03:37:14 -0400
commit531c4f896ca380812c22841e8ae396428a3327bf (patch)
tree321dfd12184406b18eb0154ff8a416f394352870
parentcdd80bd4eece6109c15864e776b83c88c3bd891b (diff)
acenic: Move the Alteon driver
Based on feedback from Alan Cox, the acenic driver moved to drivers/net/ethernet/alteon/ and made the necessary Kconfig and Makefile changes. CC: Jes Sorensen <jes@trained-monkey.org> CC: Alan Cox <alan@linux.intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--MAINTAINERS2
-rw-r--r--drivers/net/ethernet/3com/Kconfig27
-rw-r--r--drivers/net/ethernet/3com/Makefile1
-rw-r--r--drivers/net/ethernet/Kconfig1
-rw-r--r--drivers/net/ethernet/Makefile1
-rw-r--r--drivers/net/ethernet/alteon/Kconfig47
-rw-r--r--drivers/net/ethernet/alteon/Makefile5
-rw-r--r--drivers/net/ethernet/alteon/acenic.c (renamed from drivers/net/ethernet/3com/acenic.c)0
-rw-r--r--drivers/net/ethernet/alteon/acenic.h (renamed from drivers/net/ethernet/3com/acenic.h)0
9 files changed, 55 insertions, 29 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 3d8a6a6d660c..d374c6f9d05e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -213,7 +213,7 @@ ACENIC DRIVER
213M: Jes Sorensen <jes@trained-monkey.org> 213M: Jes Sorensen <jes@trained-monkey.org>
214L: linux-acenic@sunsite.dk 214L: linux-acenic@sunsite.dk
215S: Maintained 215S: Maintained
216F: drivers/net/ethernet/3com/acenic* 216F: drivers/net/ethernet/alteon/acenic*
217 217
218ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER 218ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
219M: Peter Feuerer <peter@piie.net> 219M: Peter Feuerer <peter@piie.net>
diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig
index 497f038dcd47..65cc129da114 100644
--- a/drivers/net/ethernet/3com/Kconfig
+++ b/drivers/net/ethernet/3com/Kconfig
@@ -117,31 +117,4 @@ config TYPHOON
117 To compile this driver as a module, choose M here. The module 117 To compile this driver as a module, choose M here. The module
118 will be called typhoon. 118 will be called typhoon.
119 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 120endif # NET_VENDOR_3COM
diff --git a/drivers/net/ethernet/3com/Makefile b/drivers/net/ethernet/3com/Makefile
index 96d1d60d67b6..1e5382a30ead 100644
--- a/drivers/net/ethernet/3com/Makefile
+++ b/drivers/net/ethernet/3com/Makefile
@@ -8,5 +8,4 @@ obj-$(CONFIG_3C515) += 3c515.o
8obj-$(CONFIG_PCMCIA_3C589) += 3c589_cs.o 8obj-$(CONFIG_PCMCIA_3C589) += 3c589_cs.o
9obj-$(CONFIG_PCMCIA_3C574) += 3c574_cs.o 9obj-$(CONFIG_PCMCIA_3C574) += 3c574_cs.o
10obj-$(CONFIG_VORTEX) += 3c59x.o 10obj-$(CONFIG_VORTEX) += 3c59x.o
11obj-$(CONFIG_ACENIC) += acenic.o
12obj-$(CONFIG_TYPHOON) += typhoon.o 11obj-$(CONFIG_TYPHOON) += typhoon.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index cff6ef536063..1f5a32dbe04c 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -14,6 +14,7 @@ if ETHERNET
14source "drivers/net/ethernet/3com/Kconfig" 14source "drivers/net/ethernet/3com/Kconfig"
15source "drivers/net/ethernet/adaptec/Kconfig" 15source "drivers/net/ethernet/adaptec/Kconfig"
16source "drivers/net/ethernet/aeroflex/Kconfig" 16source "drivers/net/ethernet/aeroflex/Kconfig"
17source "drivers/net/ethernet/alteon/Kconfig"
17source "drivers/net/ethernet/amd/Kconfig" 18source "drivers/net/ethernet/amd/Kconfig"
18source "drivers/net/ethernet/apple/Kconfig" 19source "drivers/net/ethernet/apple/Kconfig"
19source "drivers/net/ethernet/atheros/Kconfig" 20source "drivers/net/ethernet/atheros/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 986def799cf6..c53ad3afc991 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
6obj-$(CONFIG_NET_VENDOR_8390) += 8390/ 6obj-$(CONFIG_NET_VENDOR_8390) += 8390/
7obj-$(CONFIG_NET_VENDOR_ADAPTEC) += adaptec/ 7obj-$(CONFIG_NET_VENDOR_ADAPTEC) += adaptec/
8obj-$(CONFIG_GRETH) += aeroflex/ 8obj-$(CONFIG_GRETH) += aeroflex/
9obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/
9obj-$(CONFIG_NET_VENDOR_AMD) += amd/ 10obj-$(CONFIG_NET_VENDOR_AMD) += amd/
10obj-$(CONFIG_NET_VENDOR_APPLE) += apple/ 11obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
11obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/ 12obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
diff --git a/drivers/net/ethernet/alteon/Kconfig b/drivers/net/ethernet/alteon/Kconfig
new file mode 100644
index 000000000000..68862e4d145c
--- /dev/null
+++ b/drivers/net/ethernet/alteon/Kconfig
@@ -0,0 +1,47 @@
1#
2# Alteon network device configuration
3#
4
5config NET_VENDOR_ALTEON
6 bool "Alteon devices"
7 depends on PCI
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 Alteon cards. If you say Y, you will be asked for
16 your specific card in the following questions.
17
18if NET_VENDOR_ALTEON
19
20config ACENIC
21 tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
22 depends on PCI
23 ---help---
24 Say Y here if you have an Alteon AceNIC, 3Com 3C985(B), NetGear
25 GA620, SGI Gigabit or Farallon PN9000-SX PCI Gigabit Ethernet
26 adapter. The driver allows for using the Jumbo Frame option (9000
27 bytes/frame) however it requires that your switches can handle this
28 as well. To enable Jumbo Frames, add `mtu 9000' to your ifconfig
29 line.
30
31 To compile this driver as a module, choose M here: the
32 module will be called acenic.
33
34config ACENIC_OMIT_TIGON_I
35 bool "Omit support for old Tigon I based AceNICs"
36 depends on ACENIC
37 ---help---
38 Say Y here if you only have Tigon II based AceNICs and want to leave
39 out support for the older Tigon I based cards which are no longer
40 being sold (ie. the original Alteon AceNIC and 3Com 3C985 (non B
41 version)). This will reduce the size of the driver object by
42 app. 100KB. If you are not sure whether your card is a Tigon I or a
43 Tigon II, say N here.
44
45 The safe and default value for this is N.
46
47endif # NET_VENDOR_ALTEON
diff --git a/drivers/net/ethernet/alteon/Makefile b/drivers/net/ethernet/alteon/Makefile
new file mode 100644
index 000000000000..a2ca173f2a50
--- /dev/null
+++ b/drivers/net/ethernet/alteon/Makefile
@@ -0,0 +1,5 @@
1#
2# Makefile for the Alteon network device drivers.
3#
4
5obj-$(CONFIG_ACENIC) += acenic.o
diff --git a/drivers/net/ethernet/3com/acenic.c b/drivers/net/ethernet/alteon/acenic.c
index 31798f5f5d06..31798f5f5d06 100644
--- a/drivers/net/ethernet/3com/acenic.c
+++ b/drivers/net/ethernet/alteon/acenic.c
diff --git a/drivers/net/ethernet/3com/acenic.h b/drivers/net/ethernet/alteon/acenic.h
index 51c486cfbb8c..51c486cfbb8c 100644
--- a/drivers/net/ethernet/3com/acenic.h
+++ b/drivers/net/ethernet/alteon/acenic.h