diff mbox

[net-next,03/10] seeq: Move the SEEQ drivers

Message ID 1313134384-7287-4-git-send-email-jeffrey.t.kirsher@intel.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Kirsher, Jeffrey T Aug. 12, 2011, 7:32 a.m. UTC
Move the drivers that use SEEQ chipset into drivers/net/ethernet/seeq
and make the necessary Kconfig and Makefile changes.

CC: Russell King <linux@arm.linux.org.uk>
CC: Hamish Coleman <hamish@zot.apana.org.au>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 MAINTAINERS                                 |    3 +-
 drivers/net/Kconfig                         |   18 -----------
 drivers/net/Makefile                        |    2 -
 drivers/net/arm/Kconfig                     |    7 ----
 drivers/net/arm/Makefile                    |    1 -
 drivers/net/ethernet/Kconfig                |    1 +
 drivers/net/ethernet/Makefile               |    1 +
 drivers/net/ethernet/seeq/Kconfig           |   45 +++++++++++++++++++++++++++
 drivers/net/ethernet/seeq/Makefile          |    7 ++++
 drivers/net/{arm => ethernet/seeq}/ether3.c |    0
 drivers/net/{arm => ethernet/seeq}/ether3.h |    0
 drivers/net/{ => ethernet/seeq}/seeq8005.c  |    0
 drivers/net/{ => ethernet/seeq}/seeq8005.h  |    0
 drivers/net/{ => ethernet/seeq}/sgiseeq.c   |    0
 drivers/net/{ => ethernet/seeq}/sgiseeq.h   |    0
 15 files changed, 56 insertions(+), 29 deletions(-)
 create mode 100644 drivers/net/ethernet/seeq/Kconfig
 create mode 100644 drivers/net/ethernet/seeq/Makefile
 rename drivers/net/{arm => ethernet/seeq}/ether3.c (100%)
 rename drivers/net/{arm => ethernet/seeq}/ether3.h (100%)
 rename drivers/net/{ => ethernet/seeq}/seeq8005.c (100%)
 rename drivers/net/{ => ethernet/seeq}/seeq8005.h (100%)
 rename drivers/net/{ => ethernet/seeq}/sgiseeq.c (100%)
 rename drivers/net/{ => ethernet/seeq}/sgiseeq.h (100%)

diff --git a/drivers/net/arm/ether3.c b/drivers/net/ethernet/seeq/ether3.c
similarity index 100%
rename from drivers/net/arm/ether3.c
rename to drivers/net/ethernet/seeq/ether3.c
diff --git a/drivers/net/arm/ether3.h b/drivers/net/ethernet/seeq/ether3.h
similarity index 100%
rename from drivers/net/arm/ether3.h
rename to drivers/net/ethernet/seeq/ether3.h
diff --git a/drivers/net/seeq8005.c b/drivers/net/ethernet/seeq/seeq8005.c
similarity index 100%
rename from drivers/net/seeq8005.c
rename to drivers/net/ethernet/seeq/seeq8005.c
diff --git a/drivers/net/seeq8005.h b/drivers/net/ethernet/seeq/seeq8005.h
similarity index 100%
rename from drivers/net/seeq8005.h
rename to drivers/net/ethernet/seeq/seeq8005.h
diff --git a/drivers/net/sgiseeq.c b/drivers/net/ethernet/seeq/sgiseeq.c
similarity index 100%
rename from drivers/net/sgiseeq.c
rename to drivers/net/ethernet/seeq/sgiseeq.c
diff --git a/drivers/net/sgiseeq.h b/drivers/net/ethernet/seeq/sgiseeq.h
similarity index 100%
rename from drivers/net/sgiseeq.h
rename to drivers/net/ethernet/seeq/sgiseeq.h

Comments

Ralf Baechle Aug. 18, 2011, 7:36 p.m. UTC | #1
On Fri, Aug 12, 2011 at 12:32:57AM -0700, Jeff Kirsher wrote:

> Move the drivers that use SEEQ chipset into drivers/net/ethernet/seeq
> and make the necessary Kconfig and Makefile changes.
> 
> CC: Russell King <linux@arm.linux.org.uk>
> CC: Hamish Coleman <hamish@zot.apana.org.au>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
>  MAINTAINERS                                 |    3 +-
>  drivers/net/Kconfig                         |   18 -----------
>  drivers/net/Makefile                        |    2 -
>  drivers/net/arm/Kconfig                     |    7 ----
>  drivers/net/arm/Makefile                    |    1 -
>  drivers/net/ethernet/Kconfig                |    1 +
>  drivers/net/ethernet/Makefile               |    1 +
>  drivers/net/ethernet/seeq/Kconfig           |   45 +++++++++++++++++++++++++++
>  drivers/net/ethernet/seeq/Makefile          |    7 ++++
>  drivers/net/{arm => ethernet/seeq}/ether3.c |    0
>  drivers/net/{arm => ethernet/seeq}/ether3.h |    0
>  drivers/net/{ => ethernet/seeq}/seeq8005.c  |    0
>  drivers/net/{ => ethernet/seeq}/seeq8005.h  |    0
>  drivers/net/{ => ethernet/seeq}/sgiseeq.c   |    0
>  drivers/net/{ => ethernet/seeq}/sgiseeq.h   |    0
>  15 files changed, 56 insertions(+), 29 deletions(-)
>  create mode 100644 drivers/net/ethernet/seeq/Kconfig
>  create mode 100644 drivers/net/ethernet/seeq/Makefile
>  rename drivers/net/{arm => ethernet/seeq}/ether3.c (100%)
>  rename drivers/net/{arm => ethernet/seeq}/ether3.h (100%)
>  rename drivers/net/{ => ethernet/seeq}/seeq8005.c (100%)
>  rename drivers/net/{ => ethernet/seeq}/seeq8005.h (100%)
>  rename drivers/net/{ => ethernet/seeq}/sgiseeq.c (100%)
>  rename drivers/net/{ => ethernet/seeq}/sgiseeq.h (100%)

This makes a lot more sense than shoving the Seeq drivers into
drivers/net/ethernet/sgi/ - even though sgiseeq depends on an SGI IP22/IP28
specific DMA engine.

Acked-by: Ralf Baechle <ralf@linux-mips.org>

  Ralf
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Russell King - ARM Linux Nov. 4, 2011, 5:24 p.m. UTC | #2
Okay, this is the only patch I saw (for the SEEQ drivers), but I notice
that more of the ARM drivers have moved.  The result is not nice.  Or
even workable.

While looking for my ether1, ether3 and etherh drivers in Kconfig, I
enable every option which is presented to me under the new 'ethernet
drivers' stuff.  I'm offered my ether3 driver under the SEEQ stuff -
that's fine.  But what about the rest?

Well...

drivers/net/ethernet/intel/Kconfig:
config NET_VENDOR_INTEL
        bool "Intel devices"
        default y
        depends on PCI || PCI_MSI

drivers/net/ethernet/i825xx/Kconfig:
config NET_VENDOR_I825XX
        bool "Intel (82586/82593/82596) devices"
        default y
        depends on NET_VENDOR_INTEL && (ISA || ISA_DMA_API || ARM || \
                   ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \
                   GSC || BVME6000 || MVME16x || EXPERIMENTAL)

if NET_VENDOR_I825XX
config ARM_ETHER1
        tristate "Acorn Ether1 support"
        depends on ARM && ARCH_ACORN

This is NOT a PCI driver, yet it has ended up with a requirement for
CONFIG_PCI to be set, which is nonsense for this platform because it
has no PCI.

What about etherh?
drivers/net/ethernet/natsemi/Kconfig:
config NET_VENDOR_NATSEMI
        bool "National Semi-conductor devices"
        default y
        depends on MCA || MAC || MACH_JAZZ || PCI || XTENSA_PLATFORM_XT2000

drivers/net/ethernet/8390/Kconfig:
config NET_VENDOR_8390
        bool "National Semi-conductor 8390 devices"
        default y
        depends on NET_VENDOR_NATSEMI && (AMIGA_PCMCIA || PCI || SUPERH || \
                   ISA || MCA || EISA || MAC || M32R || MACH_TX49XX || \
                   MCA_LEGACY || H8300 || ARM || MIPS || ZORRO || PCMCIA || \
                   EXPERIMENTAL)
if NET_VENDOR_8390
config ARM_ETHERH
        tristate "I-cubed EtherH/ANT EtherM support"
        depends on ARM && ARCH_ACORN

Again, exactly the same thing.

Thankfully, ARM_AM79C961A is right, so that's two out of five correct.

I've no idea what the right solution is to this complex maze of Kconfig
stuff.  Do I through an 'ARM' into the NET_VENDOR_INTEL and
NET_VENDOR_NATSEMI dependencies?

While I realise this is a big change, and bugs like this are likely, it
would've been nice to be copied on more of the patches which affect
drivers I maintain.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kirsher, Jeffrey T Nov. 4, 2011, 9:10 p.m. UTC | #3
On Fri, 2011-11-04 at 10:24 -0700, Russell King - ARM Linux wrote:
> Okay, this is the only patch I saw (for the SEEQ drivers), but I notice
> that more of the ARM drivers have moved.  The result is not nice.  Or
> even workable.
> 
> While looking for my ether1, ether3 and etherh drivers in Kconfig, I
> enable every option which is presented to me under the new 'ethernet
> drivers' stuff.  I'm offered my ether3 driver under the SEEQ stuff -
> that's fine.  But what about the rest?
> 
> Well...
> 
> drivers/net/ethernet/intel/Kconfig:
> config NET_VENDOR_INTEL
>         bool "Intel devices"
>         default y
>         depends on PCI || PCI_MSI
> 
> drivers/net/ethernet/i825xx/Kconfig:
> config NET_VENDOR_I825XX
>         bool "Intel (82586/82593/82596) devices"
>         default y
>         depends on NET_VENDOR_INTEL && (ISA || ISA_DMA_API || ARM || \
>                    ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \
>                    GSC || BVME6000 || MVME16x || EXPERIMENTAL)
> 
> if NET_VENDOR_I825XX
> config ARM_ETHER1
>         tristate "Acorn Ether1 support"
>         depends on ARM && ARCH_ACORN
> 
> This is NOT a PCI driver, yet it has ended up with a requirement for
> CONFIG_PCI to be set, which is nonsense for this platform because it
> has no PCI.
> 
> What about etherh?
> drivers/net/ethernet/natsemi/Kconfig:
> config NET_VENDOR_NATSEMI
>         bool "National Semi-conductor devices"
>         default y
>         depends on MCA || MAC || MACH_JAZZ || PCI || XTENSA_PLATFORM_XT2000
> 
> drivers/net/ethernet/8390/Kconfig:
> config NET_VENDOR_8390
>         bool "National Semi-conductor 8390 devices"
>         default y
>         depends on NET_VENDOR_NATSEMI && (AMIGA_PCMCIA || PCI || SUPERH || \
>                    ISA || MCA || EISA || MAC || M32R || MACH_TX49XX || \
>                    MCA_LEGACY || H8300 || ARM || MIPS || ZORRO || PCMCIA || \
>                    EXPERIMENTAL)
> if NET_VENDOR_8390
> config ARM_ETHERH
>         tristate "I-cubed EtherH/ANT EtherM support"
>         depends on ARM && ARCH_ACORN
> 
> Again, exactly the same thing.
> 
> Thankfully, ARM_AM79C961A is right, so that's two out of five correct.
> 
> I've no idea what the right solution is to this complex maze of Kconfig
> stuff.  Do I through an 'ARM' into the NET_VENDOR_INTEL and
> NET_VENDOR_NATSEMI dependencies?
> 
> While I realise this is a big change, and bugs like this are likely, it
> would've been nice to be copied on more of the patches which affect
> drivers I maintain.

I just submitted a patch to resolve this issue with the "sub" Kconfig's
having a dependency which is not reflected in the "parent" Kconfig.

http://patchwork.ozlabs.org/patch/123250/
Joe Perches Nov. 4, 2011, 9:16 p.m. UTC | #4
On Fri, 2011-11-04 at 17:24 +0000, Russell King - ARM Linux wrote:
> Okay, this is the only patch I saw (for the SEEQ drivers), but I notice
> that more of the ARM drivers have moved.  The result is not nice.  Or
> even workable.
> 
> While looking for my ether1, ether3 and etherh drivers in Kconfig, I
> enable every option which is presented to me under the new 'ethernet
> drivers' stuff.  I'm offered my ether3 driver under the SEEQ stuff -
> that's fine.  But what about the rest?
[]
> While I realise this is a big change, and bugs like this are likely, it
> would've been nice to be copied on more of the patches which affect
> drivers I maintain.

Hi Russell.

What drivers in drivers/net do you maintain?

I believe this is the list in MAINTAINERS for you:

ARM/EBSA110 MACHINE SUPPORT
F:      drivers/net/ethernet/amd/am79c961a.*
ARM/RISCPC ARCHITECTURE
F:      drivers/net/ethernet/i825xx/ether1*
F:      drivers/net/ethernet/seeq/ether3*

Are there others? If yes, what are they?

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Russell King - ARM Linux Nov. 4, 2011, 9:25 p.m. UTC | #5
On Fri, Nov 04, 2011 at 11:16:07PM +0200, Joe Perches wrote:
> On Fri, 2011-11-04 at 17:24 +0000, Russell King - ARM Linux wrote:
> > Okay, this is the only patch I saw (for the SEEQ drivers), but I notice
> > that more of the ARM drivers have moved.  The result is not nice.  Or
> > even workable.
> > 
> > While looking for my ether1, ether3 and etherh drivers in Kconfig, I
> > enable every option which is presented to me under the new 'ethernet
> > drivers' stuff.  I'm offered my ether3 driver under the SEEQ stuff -
> > that's fine.  But what about the rest?
> []
> > While I realise this is a big change, and bugs like this are likely, it
> > would've been nice to be copied on more of the patches which affect
> > drivers I maintain.
> 
> Hi Russell.
> 
> What drivers in drivers/net do you maintain?
> 
> I believe this is the list in MAINTAINERS for you:
> 
> ARM/EBSA110 MACHINE SUPPORT
> F:      drivers/net/ethernet/amd/am79c961a.*
> ARM/RISCPC ARCHITECTURE
> F:      drivers/net/ethernet/i825xx/ether1*
> F:      drivers/net/ethernet/seeq/ether3*
> 
> Are there others? If yes, what are they?

If that's what's in mainline, then etherh has been dropped from that
list through this move.  It's drivers/net/ethernet/8390/etherh*, so
that needs adding back for "ARM/RISCPC ARCHITECTURE".

It was correct - below seems to be what happened...

commit 115978859272b958366d4a08c99a24f9625fa663
Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date:   Wed Jul 13 15:38:08 2011 -0700

    i825xx: Move the Intel 82586/82593/82596 based drivers

@@ -1014,7 +1014,7 @@ F:        arch/arm/include/asm/hardware/ioc.h
 F:     arch/arm/include/asm/hardware/iomd.h
 F:     arch/arm/include/asm/hardware/memc.h
 F:     arch/arm/mach-rpc/
-F:     drivers/net/arm/ether*
+F:     drivers/net/arm/ether3*

That change was probably correct at the time, because this one which
came before it:

commit 644570b830266ff33ff5f3542b9c838f93a55ea6
Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date:   Sat Apr 2 06:20:12 2011 -0700

    8390: Move the 8390 related drivers

which moved the etherh driver without updating MAINTAINERS for that
change.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Russell King - ARM Linux Nov. 4, 2011, 9:35 p.m. UTC | #6
On Fri, Nov 04, 2011 at 02:10:02PM -0700, Jeff Kirsher wrote:
> I just submitted a patch to resolve this issue with the "sub" Kconfig's
> having a dependency which is not reflected in the "parent" Kconfig.
> 
> http://patchwork.ozlabs.org/patch/123250/

Thanks, that seems to fix the issues for me.  For that patch:

Tested-by: Russell King <rmk+kernel@arm.linux.org.uk>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kirsher, Jeffrey T Nov. 4, 2011, 9:42 p.m. UTC | #7
On Fri, 2011-11-04 at 14:25 -0700, Russell King - ARM Linux wrote:
> On Fri, Nov 04, 2011 at 11:16:07PM +0200, Joe Perches wrote:
> > On Fri, 2011-11-04 at 17:24 +0000, Russell King - ARM Linux wrote:
> > > Okay, this is the only patch I saw (for the SEEQ drivers), but I notice
> > > that more of the ARM drivers have moved.  The result is not nice.  Or
> > > even workable.
> > > 
> > > While looking for my ether1, ether3 and etherh drivers in Kconfig, I
> > > enable every option which is presented to me under the new 'ethernet
> > > drivers' stuff.  I'm offered my ether3 driver under the SEEQ stuff -
> > > that's fine.  But what about the rest?
> > []
> > > While I realise this is a big change, and bugs like this are likely, it
> > > would've been nice to be copied on more of the patches which affect
> > > drivers I maintain.
> > 
> > Hi Russell.
> > 
> > What drivers in drivers/net do you maintain?
> > 
> > I believe this is the list in MAINTAINERS for you:
> > 
> > ARM/EBSA110 MACHINE SUPPORT
> > F:      drivers/net/ethernet/amd/am79c961a.*
> > ARM/RISCPC ARCHITECTURE
> > F:      drivers/net/ethernet/i825xx/ether1*
> > F:      drivers/net/ethernet/seeq/ether3*
> > 
> > Are there others? If yes, what are they?
> 
> If that's what's in mainline, then etherh has been dropped from that
> list through this move.  It's drivers/net/ethernet/8390/etherh*, so
> that needs adding back for "ARM/RISCPC ARCHITECTURE".
> 
> It was correct - below seems to be what happened...
> 
> commit 115978859272b958366d4a08c99a24f9625fa663
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date:   Wed Jul 13 15:38:08 2011 -0700
> 
>     i825xx: Move the Intel 82586/82593/82596 based drivers
> 
> @@ -1014,7 +1014,7 @@ F:        arch/arm/include/asm/hardware/ioc.h
>  F:     arch/arm/include/asm/hardware/iomd.h
>  F:     arch/arm/include/asm/hardware/memc.h
>  F:     arch/arm/mach-rpc/
> -F:     drivers/net/arm/ether*
> +F:     drivers/net/arm/ether3*
> 
> That change was probably correct at the time, because this one which
> came before it:
> 
> commit 644570b830266ff33ff5f3542b9c838f93a55ea6
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date:   Sat Apr 2 06:20:12 2011 -0700
> 
>     8390: Move the 8390 related drivers
> 
> which moved the etherh driver without updating MAINTAINERS for that
> change.

This was my bad.  There was a lot of discussion and shuffling of drivers
early on to make sure we have the drivers in the right location, and I
initially had all the drivers/net/arm/ether* drivers in the same
location.  I can put together a patch to resolve this if no one has one
in the works.

Sorry about that Russell.
diff mbox

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 1bd9fbd..e986e3e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1014,7 +1014,8 @@  F:	arch/arm/include/asm/hardware/ioc.h
 F:	arch/arm/include/asm/hardware/iomd.h
 F:	arch/arm/include/asm/hardware/memc.h
 F:	arch/arm/mach-rpc/
-F:	drivers/net/arm/ether3*
+F:	drivers/net/ethernet/i825xx/ether1*
+F:	drivers/net/ethernet/seeq/ether3*
 F:	drivers/scsi/arm/
 
 ARM/SHARK MACHINE SUPPORT
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index aec74ad..696464c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -489,17 +489,6 @@  config ETH16I
 	  To compile this driver as a module, choose M here. The module
 	  will be called eth16i.
 
-config SEEQ8005
-	tristate "SEEQ8005 support (EXPERIMENTAL)"
-	depends on NET_ISA && EXPERIMENTAL
-	help
-	  This is a driver for the SEEQ 8005 network (Ethernet) card.  If this
-	  is for you, read the Ethernet-HOWTO, available from
-	  <http://www.tldp.org/docs.html#howto>.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called seeq8005.
-
 config NET_PCI
 	bool "EISA, VLB, PCI and on board controllers"
 	depends on ISA || EISA || PCI
@@ -690,13 +679,6 @@  config NET_POCKET
 	  the questions about this class of network devices. If you say Y, you
 	  will be asked for your specific device in the following questions.
 
-config SGISEEQ
-	tristate "SGI Seeq ethernet controller support"
-	depends on SGI_HAS_SEEQ
-	help
-	  Say Y here if you have an Seeq based Ethernet network card. This is
-	  used in many Silicon Graphics machines.
-
 config FEC
 	bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
 	depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index c98e1ad..b1ead87 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -65,7 +65,6 @@  obj-$(CONFIG_SH_ETH) += sh_eth.o
 
 obj-$(CONFIG_HAMACHI) += hamachi.o
 obj-$(CONFIG_NET) += Space.o loopback.o
-obj-$(CONFIG_SEEQ8005) += seeq8005.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
 obj-$(CONFIG_HP100) += hp100.o
 obj-$(CONFIG_FEC) += fec.o
@@ -102,7 +101,6 @@  obj-$(CONFIG_IFB) += ifb.o
 obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_DEFXX) += defxx.o
-obj-$(CONFIG_SGISEEQ) += sgiseeq.o
 obj-$(CONFIG_AT1700) += at1700.o
 obj-$(CONFIG_CPMAC) += cpmac.o
 
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig
index 4320e88..b6f7302 100644
--- a/drivers/net/arm/Kconfig
+++ b/drivers/net/arm/Kconfig
@@ -3,13 +3,6 @@ 
 #  These are for Acorn's Expansion card network interfaces
 #
 
-config ARM_ETHER3
-	tristate "Acorn/ANT Ether3 support"
-	depends on ARM && ARCH_ACORN
-	help
-	  If you have an Acorn system with one of these network cards, you
-	  should say Y to this option if you wish to use it with Linux.
-
 config ARM_AT91_ETHER
 	tristate "AT91RM9200 Ethernet support"
 	depends on ARM && ARCH_AT91RM9200
diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile
index 5a0f141..a2532e6 100644
--- a/drivers/net/arm/Makefile
+++ b/drivers/net/arm/Makefile
@@ -3,7 +3,6 @@ 
 # Makefile for the ARM network device drivers
 #
 
-obj-$(CONFIG_ARM_ETHER3)	+= ether3.o
 obj-$(CONFIG_ARM_AT91_ETHER)	+= at91_ether.o
 obj-$(CONFIG_ARM_KS8695_ETHER)	+= ks8695net.o
 obj-$(CONFIG_EP93XX_ETH)	+= ep93xx_eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 7d25fa4..35ed4c2 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -36,6 +36,7 @@  source "drivers/net/ethernet/pasemi/Kconfig"
 source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
 source "drivers/net/ethernet/realtek/Kconfig"
+source "drivers/net/ethernet/seeq/Kconfig"
 source "drivers/net/ethernet/sfc/Kconfig"
 source "drivers/net/ethernet/sgi/Kconfig"
 source "drivers/net/ethernet/smsc/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index ec58715..ea0999f 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -27,6 +27,7 @@  obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
+obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/
 obj-$(CONFIG_SFC) += sfc/
 obj-$(CONFIG_NET_VENDOR_SGI) += sgi/
 obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
diff --git a/drivers/net/ethernet/seeq/Kconfig b/drivers/net/ethernet/seeq/Kconfig
new file mode 100644
index 0000000..0266791
--- /dev/null
+++ b/drivers/net/ethernet/seeq/Kconfig
@@ -0,0 +1,45 @@ 
+#
+# SEEQ device configuration
+#
+
+config NET_VENDOR_SEEQ
+	bool "SEEQ devices"
+	depends on (ARM && ARCH_ACORN) || SGI_HAS_SEEQ || EXPERIMENTAL
+	---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 SEEQ devices. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+if NET_VENDOR_SEEQ
+
+config ARM_ETHER3
+	tristate "Acorn/ANT Ether3 support"
+	depends on ARM && ARCH_ACORN
+	---help---
+	  If you have an Acorn system with one of these network cards, you
+	  should say Y to this option if you wish to use it with Linux.
+
+config SEEQ8005
+	tristate "SEEQ8005 support (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
+	---help---
+	  This is a driver for the SEEQ 8005 network (Ethernet) card.  If this
+	  is for you, read the Ethernet-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called seeq8005.
+
+config SGISEEQ
+	tristate "SGI Seeq ethernet controller support"
+	depends on SGI_HAS_SEEQ
+	---help---
+	  Say Y here if you have an Seeq based Ethernet network card. This is
+	  used in many Silicon Graphics machines.
+
+endif # NET_VENDOR_SEEQ
diff --git a/drivers/net/ethernet/seeq/Makefile b/drivers/net/ethernet/seeq/Makefile
new file mode 100644
index 0000000..3e258a5
--- /dev/null
+++ b/drivers/net/ethernet/seeq/Makefile
@@ -0,0 +1,7 @@ 
+#
+# Makefile for the SEEQ network device drivers
+#
+
+obj-$(CONFIG_ARM_ETHER3) += ether3.o
+obj-$(CONFIG_SEEQ8005) += seeq8005.o
+obj-$(CONFIG_SGISEEQ) += sgiseeq.o