aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-03-29 18:25:21 -0700
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-08-10 19:53:20 -0700
commitc1abc95b157fe4574919942018af143203ecca8e (patch)
tree8cf88016bb3ed7c11a387bd2a20a8c3ecbacbc5c
parentMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-dev-c1abc95b157fe4574919942018af143203ecca8e.tar.xz
linux-dev-c1abc95b157fe4574919942018af143203ecca8e.zip
drivers/net/ethernet: Add ethernet dir and config option
This is the initial patch to organize the drivers/net directory structure and networking device driver config options. This patch does the following: - add drivers/net/ethernet/Kconfig - integrate the new files into the existing config Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/Kconfig2
-rw-r--r--drivers/net/Makefile2
-rw-r--r--drivers/net/ethernet/Kconfig14
-rw-r--r--drivers/net/ethernet/Makefile3
4 files changed, 20 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 8d0314dbd946..5b95796942db 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -193,6 +193,8 @@ source "drivers/net/phy/Kconfig"
# Ethernet
#
+source "drivers/net/ethernet/Kconfig"
+
menuconfig NET_ETHERNET
bool "Ethernet (10 or 100Mbit)"
depends on !UML
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index e1eca2ab505e..670b5141f0d7 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -1,5 +1,5 @@
#
-# Makefile for the Linux network (ethercard) device drivers.
+# Makefile for the Linux network device drivers.
#
obj-$(CONFIG_MII) += mii.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
new file mode 100644
index 000000000000..d59e4f2aa93f
--- /dev/null
+++ b/drivers/net/ethernet/Kconfig
@@ -0,0 +1,14 @@
+#
+# Ethernet LAN device configuration
+#
+
+menuconfig ETHERNET
+ bool "Ethernet driver support"
+ depends on NET
+ default y
+ ---help---
+ This section contains all the Ethernet device drivers.
+
+if ETHERNET
+
+endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
new file mode 100644
index 000000000000..0d21dda32038
--- /dev/null
+++ b/drivers/net/ethernet/Makefile
@@ -0,0 +1,3 @@
+#
+# Makefile for the Linux network Ethernet device drivers.
+#