summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-01-25 10:08:24 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2014-01-25 15:08:26 -0500
commitb94e3495cf490e0edbf7bedfad543411eacb87a8 (patch)
tree89b26e4a03141fa1ab2d73471646d6225b51fa42 /config-generic
parentb7897ab1e47fa1a40adfe575279ca881aad8ecdd (diff)
downloadkernel-b94e3495cf490e0edbf7bedfad543411eacb87a8.tar.gz
kernel-b94e3495cf490e0edbf7bedfad543411eacb87a8.tar.xz
kernel-b94e3495cf490e0edbf7bedfad543411eacb87a8.zip
Linux v3.13-6058-g2d08cd0
- Quiet incorrect usb phy error (rhbz 1057529)
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic4
1 files changed, 4 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index 239ea05bf..479bfda3a 100644
--- a/config-generic
+++ b/config-generic
@@ -182,6 +182,7 @@ CONFIG_INFINIBAND_NES=m
CONFIG_INFINIBAND_QIB=m
CONFIG_INFINIBAND_QIB_DCA=y
# CONFIG_INFINIBAND_OCRDMA is not set
+# CONFIG_INFINIBAND_USNIC is not set
#
# Executable file formats
@@ -3200,6 +3201,7 @@ CONFIG_FB_EFI=y
# CONFIG_FB_BROADSHEET is not set
# CONFIG_FB_UDL is not set
# CONFIG_FB_GOLDFISH is not set
+# CONFIG_FB_OPENCORES is not set
# CONFIG_FIRMWARE_EDID is not set
@@ -4511,6 +4513,7 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y
# CONFIG_THERMAL_GOV_USER_SPACE is not set
CONFIG_THERMAL_GOV_STEP_WISE=y
# CONFIG_THERMAL_EMULATION is not set
+# CONFIG_THERMAL_OF is not set
# CONFIG_CPU_THERMAL is not set
CONFIG_INOTIFY=y
@@ -4772,6 +4775,7 @@ CONFIG_NOZOMI=m
CONFIG_INPUT_APANEL=m
CONFIG_INPUT_GP2A=m
# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+# CONFIG_INPUT_GPIO_BEEPER is not set
# CONFIG_INTEL_MENLOW is not set
CONFIG_ENCLOSURE_SERVICES=m