diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-01-30 10:19:02 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-01-30 10:19:32 -0500 |
commit | 1c81678d15e6d31ec39e430cf6965caf5142b17c (patch) | |
tree | feb7cedf70672eb8199761d553dbab5894a0b9be /config-generic | |
parent | 30edb93d3774c0763985fdff3390ba77fa4c26fd (diff) | |
download | kernel-1c81678d15e6d31ec39e430cf6965caf5142b17c.tar.gz kernel-1c81678d15e6d31ec39e430cf6965caf5142b17c.tar.xz kernel-1c81678d15e6d31ec39e430cf6965caf5142b17c.zip |
Linux v3.13-10094-g9b0cd30
Diffstat (limited to 'config-generic')
-rw-r--r-- | config-generic | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config-generic b/config-generic index d15d3d427..809b4832c 100644 --- a/config-generic +++ b/config-generic @@ -2740,6 +2740,7 @@ CONFIG_WM831X_WATCHDOG=m # CONFIG_DW_WATCHDOG is not set CONFIG_W83697UG_WDT=m # CONFIG_MEN_A21_WDT is not set +# CONFIG_GPIO_WATCHDOG is not set CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m @@ -2847,6 +2848,7 @@ CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y CONFIG_DRM_I915_FBDEV=y # CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set +# CONFIG_DRM_I915_UMS is not set CONFIG_DRM_VIA=m CONFIG_DRM_NOUVEAU=m CONFIG_NOUVEAU_DEBUG=5 @@ -2861,6 +2863,7 @@ CONFIG_DRM_UDL=m CONFIG_DRM_VMWGFX=m CONFIG_DRM_VMWGFX_FBCON=y CONFIG_DRM_QXL=m +CONFIG_DRM_BOCHS=m # # PCMCIA character devices |