diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-01-05 14:56:17 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-01-05 14:56:17 -0500 |
| commit | 48f65f65ce3da16aafd1a9e03fbce36410163daf (patch) | |
| tree | 7e3979cdae3a84fb38fa0412c450b366b5ad4759 /config-s390x | |
| parent | 44ce1614d8ca3f93aab59bd742a0bce163a91eb3 (diff) | |
| download | kernel-48f65f65ce3da16aafd1a9e03fbce36410163daf.tar.gz kernel-48f65f65ce3da16aafd1a9e03fbce36410163daf.tar.xz kernel-48f65f65ce3da16aafd1a9e03fbce36410163daf.zip | |
Merge 4.3.3 from stabilization branch
Diffstat (limited to 'config-s390x')
| -rw-r--r-- | config-s390x | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config-s390x b/config-s390x index f58e4d8b4..ae94aa82d 100644 --- a/config-s390x +++ b/config-s390x @@ -201,6 +201,7 @@ CONFIG_VMCP=y CONFIG_SCHED_MC=y CONFIG_SCHED_BOOK=y CONFIG_SCHED_TOPOLOGY=y +# CONFIG_NUMA is not set # CONFIG_WARN_DYNAMIC_STACK is not set @@ -290,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 |