summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-22 09:59:21 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-22 09:59:21 -0400
commit300a55307cf5a013e288c53a60bdfe09ead89f05 (patch)
treea9efdbc9973e9d0e95d99c14e84fc5f7c87c03f4 /config-armv7
parent3aeb248035163a5196f8ee93b392d449ea1c1ea7 (diff)
downloadkernel-300a55307cf5a013e288c53a60bdfe09ead89f05.tar.gz
kernel-300a55307cf5a013e288c53a60bdfe09ead89f05.tar.xz
kernel-300a55307cf5a013e288c53a60bdfe09ead89f05.zip
Linux v3.18-rc1-221-gc3351dfabf5c
- Add patch to fix wifi on X550VB machines (rhbz 1089731)
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv72
1 files changed, 2 insertions, 0 deletions
diff --git a/config-armv7 b/config-armv7
index 3a03936e7..e1d37fe5f 100644
--- a/config-armv7
+++ b/config-armv7
@@ -354,6 +354,7 @@ CONFIG_DRM_MSM=m
CONFIG_DRM_MSM_FBDEV=y
CONFIG_USB_EHCI_MSM=m
# CONFIG_DRM_MSM_REGISTER_LOGGING is not set
+CONFIG_QCOM_WDT=m
# i.MX
# CONFIG_MXC_DEBUG_BOARD is not set
@@ -619,6 +620,7 @@ CONFIG_XILLYBUS_OF=m
CONFIG_GS_FPGABOOT=m
CONFIG_USB_GADGET_XILINX=m
CONFIG_PCIE_XILINX=y
+CONFIG_CADENCE_WATCHDOG=m
# Multi function devices
CONFIG_MFD_88PM800=m