projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
Kconfig
diff --git
a/drivers/net/ethernet/Kconfig
b/drivers/net/ethernet/Kconfig
index 05aa7597dab9b712de711f61c2d14e8bd0e992e6..955d06b9cdba75e82fa87deb26fbb37e08140f87 100644
(file)
--- 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"