Enable DRM and BLKTAP.

diff --git a/linux.config b/linux.config
index 512cb9ca30db14ca8120042420e5b9397183d936..ac09a649e04f8403e3f1354cbf0fb62912661791 100644 (file)
--- a/linux.config
+++ b/linux.config
@@ -533,7 +533,7 @@ CONFIG_USB_MOUSE=m
 # CONFIG_WORKQUEUE_TRACER is not set
 # CONFIG_FTRACE_STARTUP_TEST is not set
 # CONFIG_DYNAMIC_DEBUG is not set
-CONFIG_DMA_API_DEBUG=y
+# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_IMA is not set
 CONFIG_CRYPTO_ZLIB=y
@@ -662,13 +662,24 @@ CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XENFS=m
 CONFIG_XEN_COMPAT_XENFS=y
 CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_BLKDEV_TAP=y
 
 CONFIG_STAGING=y
 CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_KMS=y
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_DRM_I830=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
+CONFIG_VGA_SWITCHEROO=y
 # CONFIG_STAGING_EXCLUDE_BUILD is not set
 # CONFIG_DRM_NOUVEAU_BACKLIGHT is not set
 CONFIG_ACPI_DEBUG=y
+CONFig_ACPI_VIDEO=y
 CONFIG_PM_VERBOSE=y
 CONFIG_IOMMU_DEBUG=y
 
@@ -677,7 +688,6 @@ CONFIG_BRIDGE=y
 # CONFIG_WIRELESS is not set
 # CONFIG_WLAN is not set
 # CONFIG_HAMRADIO is not set
-CONFIG_DMA_API_DEBUG=y
 
 CONFIG_DEBUG_RODATA_TEST=y
 CONFIG_KGDB=y