* [RFC PATCH net-next 1/6] drivers/net: Add directory ethernet
2010-12-12 12:03 [RFC PATCH net-next 0/6] Start moving ethernet drivers to new directory Joe Perches
@ 2010-12-12 12:03 ` Joe Perches
2010-12-12 12:03 ` [RFC PATCH net-next 2/6] ethernet: Move ethoc.c Joe Perches
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Joe Perches @ 2010-12-12 12:03 UTC (permalink / raw)
To: David Miller, linux-kernel; +Cc: Jeff Kirsher, Paul Gortmaker, netdev
Add empty Kconfig files for various speeds and a no effect Makefile.
Modify drivers/net Kconfig and Makefile to include these new files.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/Kconfig | 6 ++++++
drivers/net/Makefile | 2 ++
drivers/net/ethernet/Kconfig.10-100 | 3 +++
drivers/net/ethernet/Kconfig.1000 | 3 +++
drivers/net/ethernet/Kconfig.10000 | 3 +++
drivers/net/ethernet/Makefile | 9 +++++++++
6 files changed, 26 insertions(+), 0 deletions(-)
create mode 100644 drivers/net/ethernet/Kconfig.10-100
create mode 100644 drivers/net/ethernet/Kconfig.1000
create mode 100644 drivers/net/ethernet/Kconfig.10000
create mode 100644 drivers/net/ethernet/Makefile
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a20693f..c1d1be8 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -222,6 +222,8 @@ menuconfig NET_ETHERNET
if NET_ETHERNET
+source "drivers/net/ethernet/Kconfig.10-100"
+
config MACB
tristate "Atmel MACB support"
depends on HAVE_NET_MACB
@@ -2041,6 +2043,8 @@ menuconfig NETDEV_1000
if NETDEV_1000
+source "drivers/net/ethernet/Kconfig.1000"
+
config ACENIC
tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
depends on PCI
@@ -2569,6 +2573,8 @@ menuconfig NETDEV_10000
if NETDEV_10000
+source "drivers/net/ethernet/Kconfig.10000"
+
config MDIO
tristate
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 652fc6b..bfb5ade 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -2,6 +2,8 @@
# Makefile for the Linux network (ethercard) device drivers.
#
+obj-y += ethernet/
+
obj-$(CONFIG_MII) += mii.o
obj-$(CONFIG_MDIO) += mdio.o
obj-$(CONFIG_PHYLIB) += phy/
diff --git a/drivers/net/ethernet/Kconfig.10-100 b/drivers/net/ethernet/Kconfig.10-100
new file mode 100644
index 0000000..8b1ee80
--- /dev/null
+++ b/drivers/net/ethernet/Kconfig.10-100
@@ -0,0 +1,3 @@
+#
+# 10 Mb and 100Mb ethernet device configuration
+#
diff --git a/drivers/net/ethernet/Kconfig.1000 b/drivers/net/ethernet/Kconfig.1000
new file mode 100644
index 0000000..f51b97c
--- /dev/null
+++ b/drivers/net/ethernet/Kconfig.1000
@@ -0,0 +1,3 @@
+#
+# 1 Gb ethernet device configuration
+#
diff --git a/drivers/net/ethernet/Kconfig.10000 b/drivers/net/ethernet/Kconfig.10000
new file mode 100644
index 0000000..a8e28fe
--- /dev/null
+++ b/drivers/net/ethernet/Kconfig.10000
@@ -0,0 +1,3 @@
+#
+# 10 Gb ethernet device configuration
+#
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
new file mode 100644
index 0000000..f2aebec
--- /dev/null
+++ b/drivers/net/ethernet/Makefile
@@ -0,0 +1,9 @@
+#
+# Makefile for ethernet device drivers
+#
+
+# Dummy object just to avoid breaking build
+# These comments and the line below will be deleted on the
+# first addition to this file
+
+obj-$(CONFIG_ETHERNET_DUMMY_DRIVER) += /dev/null/dummy.o
--
1.7.3.3.398.g0b0cd.dirty
^ permalink raw reply related [flat|nested] 7+ messages in thread* [RFC PATCH net-next 2/6] ethernet: Move ethoc.c
2010-12-12 12:03 [RFC PATCH net-next 0/6] Start moving ethernet drivers to new directory Joe Perches
2010-12-12 12:03 ` [RFC PATCH net-next 1/6] drivers/net: Add directory ethernet Joe Perches
@ 2010-12-12 12:03 ` Joe Perches
2010-12-12 12:03 ` [RFC PATCH net-next 3/6] ethernet: Move dnet.[ch] Joe Perches
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Joe Perches @ 2010-12-12 12:03 UTC (permalink / raw)
To: David Miller, linux-kernel; +Cc: Jeff Kirsher, Paul Gortmaker, netdev
Move ethernet Open Core file to ethernet directory.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/Kconfig | 10 ----------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig.10-100 | 10 ++++++++++
drivers/net/ethernet/Makefile | 6 +-----
drivers/net/{ => ethernet}/ethoc.c | 0
5 files changed, 11 insertions(+), 16 deletions(-)
rename drivers/net/{ => ethernet}/ethoc.c (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c1d1be8..ea9dbaf 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1021,16 +1021,6 @@ config ENC28J60_WRITEVERIFY
Enable the verify after the buffer write useful for debugging purpose.
If unsure, say N.
-config ETHOC
- tristate "OpenCores 10/100 Mbps Ethernet MAC support"
- depends on NET_ETHERNET && HAS_IOMEM && HAS_DMA
- select MII
- select PHYLIB
- select CRC32
- select BITREVERSE
- help
- Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
-
config GRETH
tristate "Aeroflex Gaisler GRETH Ethernet MAC support"
depends on SPARC
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index bfb5ade..1265d0e 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -257,7 +257,6 @@ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o
obj-$(CONFIG_MLX4_CORE) += mlx4/
obj-$(CONFIG_ENC28J60) += enc28j60.o
-obj-$(CONFIG_ETHOC) += ethoc.o
obj-$(CONFIG_GRETH) += greth.o
obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o
diff --git a/drivers/net/ethernet/Kconfig.10-100 b/drivers/net/ethernet/Kconfig.10-100
index 8b1ee80..a5c62bc 100644
--- a/drivers/net/ethernet/Kconfig.10-100
+++ b/drivers/net/ethernet/Kconfig.10-100
@@ -1,3 +1,13 @@
#
# 10 Mb and 100Mb ethernet device configuration
#
+
+config ETHOC
+ tristate "OpenCores 10/100 Mbps Ethernet MAC support"
+ depends on NET_ETHERNET && HAS_IOMEM && HAS_DMA
+ select MII
+ select PHYLIB
+ select CRC32
+ select BITREVERSE
+ help
+ Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index f2aebec..ad2afc1 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -2,8 +2,4 @@
# Makefile for ethernet device drivers
#
-# Dummy object just to avoid breaking build
-# These comments and the line below will be deleted on the
-# first addition to this file
-
-obj-$(CONFIG_ETHERNET_DUMMY_DRIVER) += /dev/null/dummy.o
+obj-$(CONFIG_ETHOC) += ethoc.o
diff --git a/drivers/net/ethoc.c b/drivers/net/ethernet/ethoc.c
similarity index 100%
rename from drivers/net/ethoc.c
rename to drivers/net/ethernet/ethoc.c
--
1.7.3.3.398.g0b0cd.dirty
^ permalink raw reply related [flat|nested] 7+ messages in thread* [RFC PATCH net-next 3/6] ethernet: Move dnet.[ch]
2010-12-12 12:03 [RFC PATCH net-next 0/6] Start moving ethernet drivers to new directory Joe Perches
2010-12-12 12:03 ` [RFC PATCH net-next 1/6] drivers/net: Add directory ethernet Joe Perches
2010-12-12 12:03 ` [RFC PATCH net-next 2/6] ethernet: Move ethoc.c Joe Perches
@ 2010-12-12 12:03 ` Joe Perches
2010-12-12 12:03 ` [RFC PATCH net-next 4/6] ethernet: Move Sun Happymeal sunhme.[ch] Joe Perches
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Joe Perches @ 2010-12-12 12:03 UTC (permalink / raw)
To: David Miller, linux-kernel; +Cc: Jeff Kirsher, Paul Gortmaker, netdev
Move dnet files to ethernet directory.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/Kconfig | 11 -----------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig.10-100 | 11 +++++++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/dnet.c | 0
drivers/net/{ => ethernet}/dnet.h | 0
6 files changed, 12 insertions(+), 12 deletions(-)
rename drivers/net/{ => ethernet}/dnet.c (100%)
rename drivers/net/{ => ethernet}/dnet.h (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ea9dbaf..c0716d9 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1114,17 +1114,6 @@ config NI65
To compile this driver as a module, choose M here. The module
will be called ni65.
-config DNET
- tristate "Dave ethernet support (DNET)"
- depends on NET_ETHERNET && HAS_IOMEM
- select PHYLIB
- help
- The Dave ethernet interface (DNET) is found on Qong Board FPGA.
- Say Y to include support for the DNET chip.
-
- To compile this driver as a module, choose M here: the module
- will be called dnet.
-
source "drivers/net/tulip/Kconfig"
config AT1700
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 1265d0e..0379639 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -261,7 +261,6 @@ obj-$(CONFIG_GRETH) += greth.o
obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o
-obj-$(CONFIG_DNET) += dnet.o
obj-$(CONFIG_MACB) += macb.o
obj-$(CONFIG_S6GMAC) += s6gmac.o
diff --git a/drivers/net/ethernet/Kconfig.10-100 b/drivers/net/ethernet/Kconfig.10-100
index a5c62bc..e4fa897 100644
--- a/drivers/net/ethernet/Kconfig.10-100
+++ b/drivers/net/ethernet/Kconfig.10-100
@@ -2,6 +2,17 @@
# 10 Mb and 100Mb ethernet device configuration
#
+config DNET
+ tristate "Dave ethernet support (DNET)"
+ depends on NET_ETHERNET && HAS_IOMEM
+ select PHYLIB
+ help
+ The Dave ethernet interface (DNET) is found on Qong Board FPGA.
+ Say Y to include support for the DNET chip.
+
+ To compile this driver as a module, choose M here: the module
+ will be called dnet.
+
config ETHOC
tristate "OpenCores 10/100 Mbps Ethernet MAC support"
depends on NET_ETHERNET && HAS_IOMEM && HAS_DMA
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index ad2afc1..6e419ed 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -2,4 +2,5 @@
# Makefile for ethernet device drivers
#
+obj-$(CONFIG_DNET) += dnet.o
obj-$(CONFIG_ETHOC) += ethoc.o
diff --git a/drivers/net/dnet.c b/drivers/net/ethernet/dnet.c
similarity index 100%
rename from drivers/net/dnet.c
rename to drivers/net/ethernet/dnet.c
diff --git a/drivers/net/dnet.h b/drivers/net/ethernet/dnet.h
similarity index 100%
rename from drivers/net/dnet.h
rename to drivers/net/ethernet/dnet.h
--
1.7.3.3.398.g0b0cd.dirty
^ permalink raw reply related [flat|nested] 7+ messages in thread* [RFC PATCH net-next 4/6] ethernet: Move Sun Happymeal sunhme.[ch]
2010-12-12 12:03 [RFC PATCH net-next 0/6] Start moving ethernet drivers to new directory Joe Perches
` (2 preceding siblings ...)
2010-12-12 12:03 ` [RFC PATCH net-next 3/6] ethernet: Move dnet.[ch] Joe Perches
@ 2010-12-12 12:03 ` Joe Perches
2010-12-12 12:03 ` [RFC PATCH net-next 5/6] ethernet: Move Sun GEM sungem*.[ch] Joe Perches
2010-12-12 12:03 ` [RFC PATCH net-next 6/6] ethernet: Move Sun Cassini cassini.[ch] Joe Perches
5 siblings, 0 replies; 7+ messages in thread
From: Joe Perches @ 2010-12-12 12:03 UTC (permalink / raw)
To: David Miller, linux-kernel; +Cc: Jeff Kirsher, Paul Gortmaker, netdev
Move Sun Happymeal files to ethernet directory.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/Kconfig | 13 -------------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig.10-100 | 13 +++++++++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/sunhme.c | 0
drivers/net/{ => ethernet}/sunhme.h | 0
6 files changed, 14 insertions(+), 14 deletions(-)
rename drivers/net/{ => ethernet}/sunhme.c (100%)
rename drivers/net/{ => ethernet}/sunhme.h (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c0716d9..926f090 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -558,19 +558,6 @@ config SUNLANCE
To compile this driver as a module, choose M here: the module
will be called sunlance.
-config HAPPYMEAL
- tristate "Sun Happy Meal 10/100baseT support"
- depends on SBUS || PCI
- select CRC32
- help
- This driver supports the "hme" interface present on most Ultra
- systems and as an option on older Sbus systems. This driver supports
- both PCI and Sbus devices. This driver also supports the "qfe" quad
- 100baseT device available in both PCI and Sbus configurations.
-
- To compile this driver as a module, choose M here: the module
- will be called sunhme.
-
config SUNBMAC
tristate "Sun BigMAC 10/100baseT support (EXPERIMENTAL)"
depends on SBUS && EXPERIMENTAL
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 0379639..8f2c0ee 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -56,7 +56,6 @@ obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_ROADRUNNER) += rrunner.o
-obj-$(CONFIG_HAPPYMEAL) += sunhme.o
obj-$(CONFIG_SUNLANCE) += sunlance.o
obj-$(CONFIG_SUNQE) += sunqe.o
obj-$(CONFIG_SUNBMAC) += sunbmac.o
diff --git a/drivers/net/ethernet/Kconfig.10-100 b/drivers/net/ethernet/Kconfig.10-100
index e4fa897..dbb95d3 100644
--- a/drivers/net/ethernet/Kconfig.10-100
+++ b/drivers/net/ethernet/Kconfig.10-100
@@ -22,3 +22,16 @@ config ETHOC
select BITREVERSE
help
Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
+
+config HAPPYMEAL
+ tristate "Sun Happy Meal 10/100baseT support"
+ depends on SBUS || PCI
+ select CRC32
+ help
+ This driver supports the "hme" interface present on most Ultra
+ systems and as an option on older Sbus systems. This driver supports
+ both PCI and Sbus devices. This driver also supports the "qfe" quad
+ 100baseT device available in both PCI and Sbus configurations.
+
+ To compile this driver as a module, choose M here: the module
+ will be called sunhme.
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 6e419ed..0daa85c 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -4,3 +4,4 @@
obj-$(CONFIG_DNET) += dnet.o
obj-$(CONFIG_ETHOC) += ethoc.o
+obj-$(CONFIG_HAPPYMEAL) += sunhme.o
diff --git a/drivers/net/sunhme.c b/drivers/net/ethernet/sunhme.c
similarity index 100%
rename from drivers/net/sunhme.c
rename to drivers/net/ethernet/sunhme.c
diff --git a/drivers/net/sunhme.h b/drivers/net/ethernet/sunhme.h
similarity index 100%
rename from drivers/net/sunhme.h
rename to drivers/net/ethernet/sunhme.h
--
1.7.3.3.398.g0b0cd.dirty
^ permalink raw reply related [flat|nested] 7+ messages in thread* [RFC PATCH net-next 5/6] ethernet: Move Sun GEM sungem*.[ch]
2010-12-12 12:03 [RFC PATCH net-next 0/6] Start moving ethernet drivers to new directory Joe Perches
` (3 preceding siblings ...)
2010-12-12 12:03 ` [RFC PATCH net-next 4/6] ethernet: Move Sun Happymeal sunhme.[ch] Joe Perches
@ 2010-12-12 12:03 ` Joe Perches
2010-12-12 12:03 ` [RFC PATCH net-next 6/6] ethernet: Move Sun Cassini cassini.[ch] Joe Perches
5 siblings, 0 replies; 7+ messages in thread
From: Joe Perches @ 2010-12-12 12:03 UTC (permalink / raw)
To: David Miller, linux-kernel; +Cc: Jeff Kirsher, Paul Gortmaker, netdev
Move Sun GEM files to ethernet directory.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/Kconfig | 8 --------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig.10-100 | 8 ++++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/sungem.c | 0
drivers/net/{ => ethernet}/sungem.h | 0
drivers/net/{ => ethernet}/sungem_phy.c | 0
drivers/net/{ => ethernet}/sungem_phy.h | 0
8 files changed, 9 insertions(+), 9 deletions(-)
rename drivers/net/{ => ethernet}/sungem.c (100%)
rename drivers/net/{ => ethernet}/sungem.h (100%)
rename drivers/net/{ => ethernet}/sungem_phy.c (100%)
rename drivers/net/{ => ethernet}/sungem_phy.h (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 926f090..fbae645 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -581,14 +581,6 @@ config SUNQE
To compile this driver as a module, choose M here: the module
will be called sunqe.
-config SUNGEM
- tristate "Sun GEM support"
- depends on PCI
- select CRC32
- help
- Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also
- <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.
-
config CASSINI
tristate "Sun Cassini support"
depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 8f2c0ee..129aa08 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -60,7 +60,6 @@ obj-$(CONFIG_SUNLANCE) += sunlance.o
obj-$(CONFIG_SUNQE) += sunqe.o
obj-$(CONFIG_SUNBMAC) += sunbmac.o
obj-$(CONFIG_MYRI_SBUS) += myri_sbus.o
-obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
obj-$(CONFIG_CASSINI) += cassini.o
obj-$(CONFIG_SUNVNET) += sunvnet.o
diff --git a/drivers/net/ethernet/Kconfig.10-100 b/drivers/net/ethernet/Kconfig.10-100
index dbb95d3..f0430da 100644
--- a/drivers/net/ethernet/Kconfig.10-100
+++ b/drivers/net/ethernet/Kconfig.10-100
@@ -35,3 +35,11 @@ config HAPPYMEAL
To compile this driver as a module, choose M here: the module
will be called sunhme.
+
+config SUNGEM
+ tristate "Sun GEM support"
+ depends on PCI
+ select CRC32
+ help
+ Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also
+ <http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 0daa85c..d7c6304 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -5,3 +5,4 @@
obj-$(CONFIG_DNET) += dnet.o
obj-$(CONFIG_ETHOC) += ethoc.o
obj-$(CONFIG_HAPPYMEAL) += sunhme.o
+obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
diff --git a/drivers/net/sungem.c b/drivers/net/ethernet/sungem.c
similarity index 100%
rename from drivers/net/sungem.c
rename to drivers/net/ethernet/sungem.c
diff --git a/drivers/net/sungem.h b/drivers/net/ethernet/sungem.h
similarity index 100%
rename from drivers/net/sungem.h
rename to drivers/net/ethernet/sungem.h
diff --git a/drivers/net/sungem_phy.c b/drivers/net/ethernet/sungem_phy.c
similarity index 100%
rename from drivers/net/sungem_phy.c
rename to drivers/net/ethernet/sungem_phy.c
diff --git a/drivers/net/sungem_phy.h b/drivers/net/ethernet/sungem_phy.h
similarity index 100%
rename from drivers/net/sungem_phy.h
rename to drivers/net/ethernet/sungem_phy.h
--
1.7.3.3.398.g0b0cd.dirty
^ permalink raw reply related [flat|nested] 7+ messages in thread* [RFC PATCH net-next 6/6] ethernet: Move Sun Cassini cassini.[ch]
2010-12-12 12:03 [RFC PATCH net-next 0/6] Start moving ethernet drivers to new directory Joe Perches
` (4 preceding siblings ...)
2010-12-12 12:03 ` [RFC PATCH net-next 5/6] ethernet: Move Sun GEM sungem*.[ch] Joe Perches
@ 2010-12-12 12:03 ` Joe Perches
5 siblings, 0 replies; 7+ messages in thread
From: Joe Perches @ 2010-12-12 12:03 UTC (permalink / raw)
To: David Miller, linux-kernel; +Cc: Jeff Kirsher, Paul Gortmaker, netdev
Move Sun Cassini files to ethernet directory.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/Kconfig | 8 --------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig.10-100 | 8 ++++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/cassini.c | 0
drivers/net/{ => ethernet}/cassini.h | 0
6 files changed, 9 insertions(+), 9 deletions(-)
rename drivers/net/{ => ethernet}/cassini.c (100%)
rename drivers/net/{ => ethernet}/cassini.h (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fbae645..847dfbe 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -581,14 +581,6 @@ config SUNQE
To compile this driver as a module, choose M here: the module
will be called sunqe.
-config CASSINI
- tristate "Sun Cassini support"
- depends on PCI
- select CRC32
- help
- Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also
- <http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf>
-
config SUNVNET
tristate "Sun Virtual Network support"
depends on SUN_LDOMS
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 129aa08..3972e16 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -60,7 +60,6 @@ obj-$(CONFIG_SUNLANCE) += sunlance.o
obj-$(CONFIG_SUNQE) += sunqe.o
obj-$(CONFIG_SUNBMAC) += sunbmac.o
obj-$(CONFIG_MYRI_SBUS) += myri_sbus.o
-obj-$(CONFIG_CASSINI) += cassini.o
obj-$(CONFIG_SUNVNET) += sunvnet.o
obj-$(CONFIG_MACE) += mace.o
diff --git a/drivers/net/ethernet/Kconfig.10-100 b/drivers/net/ethernet/Kconfig.10-100
index f0430da..2bb39fc 100644
--- a/drivers/net/ethernet/Kconfig.10-100
+++ b/drivers/net/ethernet/Kconfig.10-100
@@ -23,6 +23,14 @@ config ETHOC
help
Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
+config CASSINI
+ tristate "Sun Cassini support"
+ depends on PCI
+ select CRC32
+ help
+ Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also
+ <http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf>
+
config HAPPYMEAL
tristate "Sun Happy Meal 10/100baseT support"
depends on SBUS || PCI
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index d7c6304..bba207a 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -6,3 +6,4 @@ obj-$(CONFIG_DNET) += dnet.o
obj-$(CONFIG_ETHOC) += ethoc.o
obj-$(CONFIG_HAPPYMEAL) += sunhme.o
obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
+obj-$(CONFIG_CASSINI) += cassini.o
diff --git a/drivers/net/cassini.c b/drivers/net/ethernet/cassini.c
similarity index 100%
rename from drivers/net/cassini.c
rename to drivers/net/ethernet/cassini.c
diff --git a/drivers/net/cassini.h b/drivers/net/ethernet/cassini.h
similarity index 100%
rename from drivers/net/cassini.h
rename to drivers/net/ethernet/cassini.h
--
1.7.3.3.398.g0b0cd.dirty
^ permalink raw reply related [flat|nested] 7+ messages in thread