Skip to content

Commit 9e13fbf

Browse files
author
Jeff Kirsher
committed
seeq: Move the SEEQ drivers
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>
1 parent 8862bf1 commit 9e13fbf

File tree

15 files changed

+56
-29
lines changed

15 files changed

+56
-29
lines changed

MAINTAINERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,8 @@ F: arch/arm/include/asm/hardware/ioc.h
10141014
F: arch/arm/include/asm/hardware/iomd.h
10151015
F: arch/arm/include/asm/hardware/memc.h
10161016
F: arch/arm/mach-rpc/
1017-
F: drivers/net/arm/ether3*
1017+
F: drivers/net/ethernet/i825xx/ether1*
1018+
F: drivers/net/ethernet/seeq/ether3*
10181019
F: drivers/scsi/arm/
10191020

10201021
ARM/SHARK MACHINE SUPPORT

drivers/net/Kconfig

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -489,17 +489,6 @@ config ETH16I
489489
To compile this driver as a module, choose M here. The module
490490
will be called eth16i.
491491

492-
config SEEQ8005
493-
tristate "SEEQ8005 support (EXPERIMENTAL)"
494-
depends on NET_ISA && EXPERIMENTAL
495-
help
496-
This is a driver for the SEEQ 8005 network (Ethernet) card. If this
497-
is for you, read the Ethernet-HOWTO, available from
498-
<http://www.tldp.org/docs.html#howto>.
499-
500-
To compile this driver as a module, choose M here. The module
501-
will be called seeq8005.
502-
503492
config NET_PCI
504493
bool "EISA, VLB, PCI and on board controllers"
505494
depends on ISA || EISA || PCI
@@ -690,13 +679,6 @@ config NET_POCKET
690679
the questions about this class of network devices. If you say Y, you
691680
will be asked for your specific device in the following questions.
692681

693-
config SGISEEQ
694-
tristate "SGI Seeq ethernet controller support"
695-
depends on SGI_HAS_SEEQ
696-
help
697-
Say Y here if you have an Seeq based Ethernet network card. This is
698-
used in many Silicon Graphics machines.
699-
700682
config FEC
701683
bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
702684
depends on M523x || M527x || M5272 || M528x || M520x || M532x || \

drivers/net/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ obj-$(CONFIG_SH_ETH) += sh_eth.o
6565

6666
obj-$(CONFIG_HAMACHI) += hamachi.o
6767
obj-$(CONFIG_NET) += Space.o loopback.o
68-
obj-$(CONFIG_SEEQ8005) += seeq8005.o
6968
obj-$(CONFIG_NET_SB1000) += sb1000.o
7069
obj-$(CONFIG_HP100) += hp100.o
7170
obj-$(CONFIG_FEC) += fec.o
@@ -102,7 +101,6 @@ obj-$(CONFIG_IFB) += ifb.o
102101
obj-$(CONFIG_MACVLAN) += macvlan.o
103102
obj-$(CONFIG_MACVTAP) += macvtap.o
104103
obj-$(CONFIG_DEFXX) += defxx.o
105-
obj-$(CONFIG_SGISEEQ) += sgiseeq.o
106104
obj-$(CONFIG_AT1700) += at1700.o
107105
obj-$(CONFIG_CPMAC) += cpmac.o
108106

drivers/net/arm/Kconfig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33
# These are for Acorn's Expansion card network interfaces
44
#
55

6-
config ARM_ETHER3
7-
tristate "Acorn/ANT Ether3 support"
8-
depends on ARM && ARCH_ACORN
9-
help
10-
If you have an Acorn system with one of these network cards, you
11-
should say Y to this option if you wish to use it with Linux.
12-
136
config ARM_AT91_ETHER
147
tristate "AT91RM9200 Ethernet support"
158
depends on ARM && ARCH_AT91RM9200

drivers/net/arm/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# Makefile for the ARM network device drivers
44
#
55

6-
obj-$(CONFIG_ARM_ETHER3) += ether3.o
76
obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
87
obj-$(CONFIG_ARM_KS8695_ETHER) += ks8695net.o
98
obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o

drivers/net/ethernet/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ source "drivers/net/ethernet/pasemi/Kconfig"
3636
source "drivers/net/ethernet/qlogic/Kconfig"
3737
source "drivers/net/ethernet/racal/Kconfig"
3838
source "drivers/net/ethernet/realtek/Kconfig"
39+
source "drivers/net/ethernet/seeq/Kconfig"
3940
source "drivers/net/ethernet/sfc/Kconfig"
4041
source "drivers/net/ethernet/sgi/Kconfig"
4142
source "drivers/net/ethernet/smsc/Kconfig"

drivers/net/ethernet/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
2727
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
2828
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
2929
obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
30+
obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/
3031
obj-$(CONFIG_SFC) += sfc/
3132
obj-$(CONFIG_NET_VENDOR_SGI) += sgi/
3233
obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/

drivers/net/ethernet/seeq/Kconfig

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#
2+
# SEEQ device configuration
3+
#
4+
5+
config NET_VENDOR_SEEQ
6+
bool "SEEQ devices"
7+
depends on (ARM && ARCH_ACORN) || SGI_HAS_SEEQ || EXPERIMENTAL
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 SEEQ devices. If you say Y, you will be asked for
16+
your specific card in the following questions.
17+
18+
if NET_VENDOR_SEEQ
19+
20+
config ARM_ETHER3
21+
tristate "Acorn/ANT Ether3 support"
22+
depends on ARM && ARCH_ACORN
23+
---help---
24+
If you have an Acorn system with one of these network cards, you
25+
should say Y to this option if you wish to use it with Linux.
26+
27+
config SEEQ8005
28+
tristate "SEEQ8005 support (EXPERIMENTAL)"
29+
depends on EXPERIMENTAL
30+
---help---
31+
This is a driver for the SEEQ 8005 network (Ethernet) card. If this
32+
is for you, read the Ethernet-HOWTO, available from
33+
<http://www.tldp.org/docs.html#howto>.
34+
35+
To compile this driver as a module, choose M here. The module
36+
will be called seeq8005.
37+
38+
config SGISEEQ
39+
tristate "SGI Seeq ethernet controller support"
40+
depends on SGI_HAS_SEEQ
41+
---help---
42+
Say Y here if you have an Seeq based Ethernet network card. This is
43+
used in many Silicon Graphics machines.
44+
45+
endif # NET_VENDOR_SEEQ

drivers/net/ethernet/seeq/Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#
2+
# Makefile for the SEEQ network device drivers
3+
#
4+
5+
obj-$(CONFIG_ARM_ETHER3) += ether3.o
6+
obj-$(CONFIG_SEEQ8005) += seeq8005.o
7+
obj-$(CONFIG_SGISEEQ) += sgiseeq.o
File renamed without changes.

0 commit comments

Comments
 (0)