diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-07-24 17:01:17 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-13 02:46:51 -0400 |
commit | 9c8571da0a85e4491d1d5bda088b534087e29497 (patch) | |
tree | c565160211fd681db03e2e802ddf669a0b6d105c /drivers/net | |
parent | 7e25d72458c64e6ca76d69ae8da9ba98f1bf9d25 (diff) |
dnet: Move the Dave Ethernet driver
Move the Dave Ethernet driver into drivers/net/ethernet/ and
make the necessary Kconfig and Makefile changes.
CC: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/Kconfig | 11 | ||||
-rw-r--r-- | drivers/net/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/Kconfig | 12 | ||||
-rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/dnet.c (renamed from drivers/net/dnet.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/dnet.h (renamed from drivers/net/dnet.h) | 0 |
6 files changed, 13 insertions, 12 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 39ba7999859d..d292da7f90bd 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -309,17 +309,6 @@ config GRETH | |||
309 | help | 309 | help |
310 | Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC. | 310 | Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC. |
311 | 311 | ||
312 | config DNET | ||
313 | tristate "Dave ethernet support (DNET)" | ||
314 | depends on NET_ETHERNET && HAS_IOMEM | ||
315 | select PHYLIB | ||
316 | help | ||
317 | The Dave ethernet interface (DNET) is found on Qong Board FPGA. | ||
318 | Say Y to include support for the DNET chip. | ||
319 | |||
320 | To compile this driver as a module, choose M here: the module | ||
321 | will be called dnet. | ||
322 | |||
323 | config NET_PCI | 312 | config NET_PCI |
324 | bool "EISA, VLB, PCI and on board controllers" | 313 | bool "EISA, VLB, PCI and on board controllers" |
325 | depends on ISA || EISA || PCI | 314 | depends on ISA || EISA || PCI |
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 5b37149a4f7a..14960d4c0449 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
@@ -57,7 +57,6 @@ obj-$(CONFIG_ENC28J60) += enc28j60.o | |||
57 | obj-$(CONFIG_ETHOC) += ethoc.o | 57 | obj-$(CONFIG_ETHOC) += ethoc.o |
58 | obj-$(CONFIG_GRETH) += greth.o | 58 | obj-$(CONFIG_GRETH) += greth.o |
59 | 59 | ||
60 | obj-$(CONFIG_DNET) += dnet.o | ||
61 | obj-$(CONFIG_DEV_APPLETALK) += appletalk/ | 60 | obj-$(CONFIG_DEV_APPLETALK) += appletalk/ |
62 | obj-$(CONFIG_ETHERNET) += ethernet/ | 61 | obj-$(CONFIG_ETHERNET) += ethernet/ |
63 | obj-$(CONFIG_TR) += tokenring/ | 62 | obj-$(CONFIG_TR) += tokenring/ |
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index c1ce35670ee1..a9117536f113 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig | |||
@@ -23,6 +23,18 @@ source "drivers/net/ethernet/brocade/Kconfig" | |||
23 | source "drivers/net/ethernet/chelsio/Kconfig" | 23 | source "drivers/net/ethernet/chelsio/Kconfig" |
24 | source "drivers/net/ethernet/cirrus/Kconfig" | 24 | source "drivers/net/ethernet/cirrus/Kconfig" |
25 | source "drivers/net/ethernet/cisco/Kconfig" | 25 | source "drivers/net/ethernet/cisco/Kconfig" |
26 | |||
27 | config DNET | ||
28 | tristate "Dave ethernet support (DNET)" | ||
29 | depends on HAS_IOMEM | ||
30 | select PHYLIB | ||
31 | ---help--- | ||
32 | The Dave ethernet interface (DNET) is found on Qong Board FPGA. | ||
33 | Say Y to include support for the DNET chip. | ||
34 | |||
35 | To compile this driver as a module, choose M here: the module | ||
36 | will be called dnet. | ||
37 | |||
26 | source "drivers/net/ethernet/dec/Kconfig" | 38 | source "drivers/net/ethernet/dec/Kconfig" |
27 | source "drivers/net/ethernet/dlink/Kconfig" | 39 | source "drivers/net/ethernet/dlink/Kconfig" |
28 | source "drivers/net/ethernet/emulex/Kconfig" | 40 | source "drivers/net/ethernet/emulex/Kconfig" |
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 34e84fa3f43e..51542912afd9 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile | |||
@@ -15,6 +15,7 @@ obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/ | |||
15 | obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ | 15 | obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ |
16 | obj-$(CONFIG_NET_VENDOR_CIRRUS) += cirrus/ | 16 | obj-$(CONFIG_NET_VENDOR_CIRRUS) += cirrus/ |
17 | obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/ | 17 | obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/ |
18 | obj-$(CONFIG_DNET) += dnet.o | ||
18 | obj-$(CONFIG_NET_VENDOR_DEC) += dec/ | 19 | obj-$(CONFIG_NET_VENDOR_DEC) += dec/ |
19 | obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/ | 20 | obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/ |
20 | obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/ | 21 | obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/ |
diff --git a/drivers/net/dnet.c b/drivers/net/ethernet/dnet.c index c1063d1540c2..c1063d1540c2 100644 --- a/drivers/net/dnet.c +++ b/drivers/net/ethernet/dnet.c | |||
diff --git a/drivers/net/dnet.h b/drivers/net/ethernet/dnet.h index 37f5b30fa78b..37f5b30fa78b 100644 --- a/drivers/net/dnet.h +++ b/drivers/net/ethernet/dnet.h | |||