diff options
| -rw-r--r-- | drivers/net/Kconfig | 28 | ||||
| -rw-r--r-- | drivers/net/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/davicom/Kconfig | 31 | ||||
| -rw-r--r-- | drivers/net/ethernet/davicom/Makefile | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/davicom/dm9000.c (renamed from drivers/net/dm9000.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/davicom/dm9000.h (renamed from drivers/net/dm9000.h) | 0 |
8 files changed, 38 insertions, 29 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index e83f559a2c4..23155cc4a48 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -246,34 +246,6 @@ config NET_NETX To compile this driver as a module, choose M here. The module will be called netx-eth. -config DM9000 - tristate "DM9000 support" - depends on ARM || BLACKFIN || MIPS - select CRC32 - select MII - ---help--- - Support for DM9000 chipset. - - To compile this driver as a module, choose M here. The module - will be called dm9000. - -config DM9000_DEBUGLEVEL - int "DM9000 maximum debug level" - depends on DM9000 - default 4 - help - The maximum level of debugging code compiled into the DM9000 - driver. - -config DM9000_FORCE_SIMPLE_PHY_POLL - bool "Force simple NSR based PHY polling" - depends on DM9000 - ---help--- - This configuration forces the DM9000 to use the NSR's LinkStatus - bit to determine if the link is up or down instead of the more - costly MII PHY reads. Note, this will not work if the chip is - operating with an external PHY. - config NET_PCI bool "EISA, VLB, PCI and on board controllers" depends on ISA || EISA || PCI diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 08ee56fc607..298587f65c2 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -52,7 +52,6 @@ obj-$(CONFIG_EQUALIZER) += eql.o obj-$(CONFIG_TUN) += tun.o obj-$(CONFIG_VETH) += veth.o obj-$(CONFIG_NET_NETX) += netx-eth.o -obj-$(CONFIG_DM9000) += dm9000.o obj-$(CONFIG_DEV_APPLETALK) += appletalk/ obj-$(CONFIG_ETHERNET) += ethernet/ diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 0cec25cbf36..45eef598cbb 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -24,6 +24,7 @@ source "drivers/net/ethernet/brocade/Kconfig" source "drivers/net/ethernet/chelsio/Kconfig" source "drivers/net/ethernet/cirrus/Kconfig" source "drivers/net/ethernet/cisco/Kconfig" +source "drivers/net/ethernet/davicom/Kconfig" config DNET tristate "Dave ethernet support (DNET)" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index ebe8aee3f83..dfd51467ea6 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ obj-$(CONFIG_NET_VENDOR_CIRRUS) += cirrus/ obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/ +obj-$(CONFIG_DM9000) += davicom/ obj-$(CONFIG_DNET) += dnet.o obj-$(CONFIG_NET_VENDOR_DEC) += dec/ obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/ diff --git a/drivers/net/ethernet/davicom/Kconfig b/drivers/net/ethernet/davicom/Kconfig new file mode 100644 index 00000000000..1809d25d6ed --- /dev/null +++ b/drivers/net/ethernet/davicom/Kconfig @@ -0,0 +1,31 @@ +# +# Davicom device configuration +# + +config DM9000 + tristate "DM9000 support" + depends on ARM || BLACKFIN || MIPS + select CRC32 + select MII + ---help--- + Support for DM9000 chipset. + + To compile this driver as a module, choose M here. The module + will be called dm9000. + +config DM9000_DEBUGLEVEL + int "DM9000 maximum debug level" + depends on DM9000 + default 4 + ---help--- + The maximum level of debugging code compiled into the DM9000 + driver. + +config DM9000_FORCE_SIMPLE_PHY_POLL + bool "Force simple NSR based PHY polling" + depends on DM9000 + ---help--- + This configuration forces the DM9000 to use the NSR's LinkStatus + bit to determine if the link is up or down instead of the more + costly MII PHY reads. Note, this will not work if the chip is + operating with an external PHY. diff --git a/drivers/net/ethernet/davicom/Makefile b/drivers/net/ethernet/davicom/Makefile new file mode 100644 index 00000000000..74b31f0ebe1 --- /dev/null +++ b/drivers/net/ethernet/davicom/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Davicom device drivers. +# + +obj-$(CONFIG_DM9000) += dm9000.o diff --git a/drivers/net/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c index 8ef31dc4704..8ef31dc4704 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/ethernet/davicom/dm9000.c diff --git a/drivers/net/dm9000.h b/drivers/net/ethernet/davicom/dm9000.h index 55688bd1a3e..55688bd1a3e 100644 --- a/drivers/net/dm9000.h +++ b/drivers/net/ethernet/davicom/dm9000.h |