diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-05-20 07:50:27 -0700 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-12 00:21:33 -0700 |
commit | 8862bf1ed60de49550109b7023a0a33eb7db8b3c (patch) | |
tree | 76e2c24e847a986c139061f5d522aa94ce97e083 /drivers/net/ethernet | |
parent | ewrk3/tulip: Move the DEC - Tulip drivers (diff) | |
download | linux-dev-8862bf1ed60de49550109b7023a0a33eb7db8b3c.tar.xz linux-dev-8862bf1ed60de49550109b7023a0a33eb7db8b3c.zip |
ioc3-eth/meth: Move the SGI drivers
Move the SGI drivers into drivers/net/ethernet/sgi/ and make the
necessary Kconfig and Makefile changes.
CC: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to '')
-rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/sgi/Kconfig | 34 | ||||
-rw-r--r-- | drivers/net/ethernet/sgi/Makefile | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/sgi/ioc3-eth.c (renamed from drivers/net/ioc3-eth.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sgi/meth.c (renamed from drivers/net/meth.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sgi/meth.h (renamed from drivers/net/meth.h) | 0 |
7 files changed, 42 insertions, 0 deletions
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index ed428501abba..7d25fa490a25 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -37,6 +37,7 @@ source "drivers/net/ethernet/qlogic/Kconfig" source "drivers/net/ethernet/racal/Kconfig" source "drivers/net/ethernet/realtek/Kconfig" source "drivers/net/ethernet/sfc/Kconfig" +source "drivers/net/ethernet/sgi/Kconfig" source "drivers/net/ethernet/smsc/Kconfig" source "drivers/net/ethernet/stmicro/Kconfig" source "drivers/net/ethernet/sun/Kconfig" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 3de82490adec..ec587159eec1 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -28,6 +28,7 @@ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ obj-$(CONFIG_NET_VENDOR_RACAL) += racal/ obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/ obj-$(CONFIG_SFC) += sfc/ +obj-$(CONFIG_NET_VENDOR_SGI) += sgi/ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/ obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/ obj-$(CONFIG_NET_VENDOR_SUN) += sun/ diff --git a/drivers/net/ethernet/sgi/Kconfig b/drivers/net/ethernet/sgi/Kconfig new file mode 100644 index 000000000000..3098594ab274 --- /dev/null +++ b/drivers/net/ethernet/sgi/Kconfig @@ -0,0 +1,34 @@ +# +# SGI device configuration +# + +config NET_VENDOR_SGI + bool "SGI devices" + depends on (PCI && SGI_IP27) || SGI_IP32 + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. + + Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about SGI devices. If you say Y, you will be asked for + your specific card in the following questions. + +if NET_VENDOR_SGI + +config SGI_IOC3_ETH + bool "SGI IOC3 Ethernet" + depends on PCI && SGI_IP27 + select CRC32 + select MII + ---help--- + If you have a network (Ethernet) card of this type, say Y and read + the Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. + +config SGI_O2MACE_ETH + tristate "SGI O2 MACE Fast Ethernet support" + depends on SGI_IP32=y + +endif # NET_VENDOR_SGI diff --git a/drivers/net/ethernet/sgi/Makefile b/drivers/net/ethernet/sgi/Makefile new file mode 100644 index 000000000000..e5bedd271e29 --- /dev/null +++ b/drivers/net/ethernet/sgi/Makefile @@ -0,0 +1,6 @@ +# +# Makefile for the SGI device drivers. +# + +obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o +obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c index a234e4504522..a234e4504522 100644 --- a/drivers/net/ioc3-eth.c +++ b/drivers/net/ethernet/sgi/ioc3-eth.c diff --git a/drivers/net/meth.c b/drivers/net/ethernet/sgi/meth.c index 60135aa55802..60135aa55802 100644 --- a/drivers/net/meth.c +++ b/drivers/net/ethernet/sgi/meth.c diff --git a/drivers/net/meth.h b/drivers/net/ethernet/sgi/meth.h index 5b145c6bad60..5b145c6bad60 100644 --- a/drivers/net/meth.h +++ b/drivers/net/ethernet/sgi/meth.h |