summaryrefslogtreecommitdiffstats
path: root/config-s390x
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-09-03 16:00:15 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-09-03 16:00:15 -0400
commitf7d396f40624ea6415f89355e920ad67e53aa78a (patch)
tree3d9198de5641b43e9eff3c67f6f699ddc9525438 /config-s390x
parent55d5380c9143600ac8d56de9dc303f7e68f3c3bf (diff)
downloadkernel-f7d396f40624ea6415f89355e920ad67e53aa78a.tar.gz
kernel-f7d396f40624ea6415f89355e920ad67e53aa78a.tar.xz
kernel-f7d396f40624ea6415f89355e920ad67e53aa78a.zip
Linux v4.2-6105-gdd5cdb48edfd
- Networking merge
Diffstat (limited to 'config-s390x')
-rw-r--r--config-s390x1
1 files changed, 1 insertions, 0 deletions
diff --git a/config-s390x b/config-s390x
index c389e31c5..ae94aa82d 100644
--- a/config-s390x
+++ b/config-s390x
@@ -291,6 +291,7 @@ CONFIG_HOTPLUG_PCI_S390=y
# CONFIG_SH_ETH is not set
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_IEEE802154_DRIVERS is not set
+# CONFIG_MDIO_OCTEON is not set
# CONFIG_FMC is not set