summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-11-26 01:47:38 +0300
committerArnd Bergmann <arnd@arndb.de>2015-11-26 01:47:38 +0300
commitd3de94ba4e58e8043d500f7335797d6a2ac93248 (patch)
tree8382a170965eec00ebfe62e7b42dfdea9ca44f54 /drivers/net/ethernet/Kconfig
parentfabc2c9c1ff5376489e83e142f1ab236609435b1 (diff)
parent1ec218373b8ebda821aec00bb156a9c94fad9cd4 (diff)
downloadlinux-d3de94ba4e58e8043d500f7335797d6a2ac93248.tar.xz
Merge tag 'v4.4-rc2' into fixes
Linux 4.4-rc2 is backmerged from the keystone fixes.
Diffstat (limited to 'drivers/net/ethernet/Kconfig')
-rw-r--r--drivers/net/ethernet/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 05aa7597dab9..955d06b9cdba 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -78,7 +78,6 @@ source "drivers/net/ethernet/ibm/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/i825xx/Kconfig"
source "drivers/net/ethernet/xscale/Kconfig"
-source "drivers/net/ethernet/icplus/Kconfig"
config JME
tristate "JMicron(R) PCI-Express Gigabit Ethernet support"