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-powerpc64-generic | |
| 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-powerpc64-generic')
| -rw-r--r-- | config-powerpc64-generic | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config-powerpc64-generic b/config-powerpc64-generic index ce547a8d2..7f0b10585 100644 --- a/config-powerpc64-generic +++ b/config-powerpc64-generic @@ -14,6 +14,7 @@ CONFIG_PPC_PSERIES=y # CONFIG_PPC_PMAC is not set # CONFIG_PPC_PMAC64 is not set # CONFIG_PPC_PS3 is not set +CONFIG_HIBERNATION=n CONFIG_EXTRA_TARGETS="" @@ -127,6 +128,7 @@ CONFIG_MTD_POWERNV_FLASH=m CONFIG_PPC_TRANSACTIONAL_MEM=y CONFIG_BLK_DEV_RSXX=m CONFIG_CXL=m +CONFIG_CXLFLASH=m CONFIG_IBMEBUS=y CONFIG_EHEA=m CONFIG_INFINIBAND_EHCA=m @@ -209,6 +211,7 @@ CONFIG_CAPI_EICON=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_POWERNV=m CONFIG_USB_EHCI_HCD_PPC_OF=y CONFIG_USB_OHCI_HCD_PCI=y @@ -358,6 +361,8 @@ CONFIG_I2C_MPC=m # CONFIG_NET_VENDOR_PASEMI is not set # CONFIG_NET_VENDOR_TOSHIBA is not set +CONFIG_MDIO_OCTEON=m + # CONFIG_OF_UNITTEST is not set # CONFIG_OF_OVERLAY is not set # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set |