Skip to content

Commit

Permalink
net/ethernet: sc92031 is not Realtek
Browse files Browse the repository at this point in the history
While the SC92031 could be found on fake "Realtek" NICs, it has no
relationship to Realtek, and is actually from Silan.

Create a new subdirectory for silan and move sc92031 there.

Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Cesar Eduardo Barros authored and David S. Miller committed Nov 1, 2011
1 parent 048ca16 commit 1b6b717
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 13 deletions.
1 change: 1 addition & 0 deletions drivers/net/ethernet/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ config S6GMAC
will be called s6gmac.

source "drivers/net/ethernet/seeq/Kconfig"
source "drivers/net/ethernet/silan/Kconfig"
source "drivers/net/ethernet/sis/Kconfig"
source "drivers/net/ethernet/sfc/Kconfig"
source "drivers/net/ethernet/sgi/Kconfig"
Expand Down
1 change: 1 addition & 0 deletions drivers/net/ethernet/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ obj-$(CONFIG_SH_ETH) += renesas/
obj-$(CONFIG_NET_VENDOR_RDC) += rdc/
obj-$(CONFIG_S6GMAC) += s6gmac.o
obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/
obj-$(CONFIG_NET_VENDOR_SILAN) += silan/
obj-$(CONFIG_NET_VENDOR_SIS) += sis/
obj-$(CONFIG_SFC) += sfc/
obj-$(CONFIG_NET_VENDOR_SGI) += sgi/
Expand Down
12 changes: 0 additions & 12 deletions drivers/net/ethernet/realtek/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,4 @@ config R8169
To compile this driver as a module, choose M here: the module
will be called r8169. This is recommended.

config SC92031
tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
depends on PCI && EXPERIMENTAL
select CRC32
---help---
This is a driver for the Fast Ethernet PCI network cards based on
the Silan SC92031 chip (sometimes also called Rsltek 8139D). If you
have one of these, say Y here.

To compile this driver as a module, choose M here: the module
will be called sc92031. This is recommended.

endif # NET_VENDOR_REALTEK
1 change: 0 additions & 1 deletion drivers/net/ethernet/realtek/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ obj-$(CONFIG_8139CP) += 8139cp.o
obj-$(CONFIG_8139TOO) += 8139too.o
obj-$(CONFIG_ATP) += atp.o
obj-$(CONFIG_R8169) += r8169.o
obj-$(CONFIG_SC92031) += sc92031.o
33 changes: 33 additions & 0 deletions drivers/net/ethernet/silan/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#
# Silan device configuration
#

config NET_VENDOR_SILAN
bool "Silan devices"
default y
depends on PCI && 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 Silan devices. If you say Y, you will be asked for
your specific card in the following questions.

if NET_VENDOR_SILAN

config SC92031
tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
depends on PCI && EXPERIMENTAL
select CRC32
---help---
This is a driver for the Fast Ethernet PCI network cards based on
the Silan SC92031 chip (sometimes also called Rsltek 8139D). If you
have one of these, say Y here.

To compile this driver as a module, choose M here: the module
will be called sc92031. This is recommended.

endif # NET_VENDOR_SILAN
5 changes: 5 additions & 0 deletions drivers/net/ethernet/silan/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#
# Makefile for the Silan network device drivers.
#

obj-$(CONFIG_SC92031) += sc92031.o
File renamed without changes.

0 comments on commit 1b6b717

Please sign in to comment.