minor config cleanups (NFC)

37 files changed, 0 insertions, 226 deletions

diff --git a/baseconfig/CONFIG_DRM_MALI_DISPLAY b/baseconfig/CONFIG_DRM_MALI_DISPLAY
deleted file mode 100644
index af3d09fbe..000000000
--- a/baseconfig/CONFIG_DRM_MALI_DISPLAY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_MALI_DISPLAY is not set
diff --git a/baseconfig/arm/CONFIG_DRM_VMWGFX b/baseconfig/arm/CONFIG_DRM_VMWGFX
deleted file mode 100644
index 4e22be4d9..000000000
--- a/baseconfig/arm/CONFIG_DRM_VMWGFX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_VMWGFX is not set
diff --git a/baseconfig/CONFIG_DRM_I810 b/baseconfig/x86/CONFIG_DRM_I810
index 23cc8b602..23cc8b602 100644
--- a/baseconfig/CONFIG_DRM_I810
+++ b/baseconfig/x86/CONFIG_DRM_I810
diff --git a/baseconfig/CONFIG_DRM_I915 b/baseconfig/x86/CONFIG_DRM_I915
index 1034adf42..1034adf42 100644
--- a/baseconfig/CONFIG_DRM_I915
+++ b/baseconfig/x86/CONFIG_DRM_I915
diff --git a/baseconfig/CONFIG_DRM_I915_ALPHA_SUPPORT b/baseconfig/x86/CONFIG_DRM_I915_ALPHA_SUPPORT
index 49c76cb99..49c76cb99 100644
--- a/baseconfig/CONFIG_DRM_I915_ALPHA_SUPPORT
+++ b/baseconfig/x86/CONFIG_DRM_I915_ALPHA_SUPPORT
diff --git a/baseconfig/CONFIG_DRM_I915_CAPTURE_ERROR b/baseconfig/x86/CONFIG_DRM_I915_CAPTURE_ERROR
index d85c72035..d85c72035 100644
--- a/baseconfig/CONFIG_DRM_I915_CAPTURE_ERROR
+++ b/baseconfig/x86/CONFIG_DRM_I915_CAPTURE_ERROR
diff --git a/baseconfig/CONFIG_DRM_I915_COMPRESS_ERROR b/baseconfig/x86/CONFIG_DRM_I915_COMPRESS_ERROR
index 6d6c129f5..6d6c129f5 100644
--- a/baseconfig/CONFIG_DRM_I915_COMPRESS_ERROR
+++ b/baseconfig/x86/CONFIG_DRM_I915_COMPRESS_ERROR
diff --git a/baseconfig/CONFIG_DRM_I915_GVT b/baseconfig/x86/CONFIG_DRM_I915_GVT
index c6af3c3cc..c6af3c3cc 100644
--- a/baseconfig/CONFIG_DRM_I915_GVT
+++ b/baseconfig/x86/CONFIG_DRM_I915_GVT
diff --git a/baseconfig/CONFIG_DRM_I915_GVT_KVMGT b/baseconfig/x86/CONFIG_DRM_I915_GVT_KVMGT
index 016a41e8a..016a41e8a 100644
--- a/baseconfig/CONFIG_DRM_I915_GVT_KVMGT
+++ b/baseconfig/x86/CONFIG_DRM_I915_GVT_KVMGT
diff --git a/baseconfig/CONFIG_DRM_I915_USERPTR b/baseconfig/x86/CONFIG_DRM_I915_USERPTR
index 4f253abc1..4f253abc1 100644
--- a/baseconfig/CONFIG_DRM_I915_USERPTR
+++ b/baseconfig/x86/CONFIG_DRM_I915_USERPTR
diff --git a/baseconfig/CONFIG_DRM_VMWGFX b/baseconfig/x86/CONFIG_DRM_VMWGFX
index 12fe6b15f..12fe6b15f 100644
--- a/baseconfig/CONFIG_DRM_VMWGFX
+++ b/baseconfig/x86/CONFIG_DRM_VMWGFX
diff --git a/baseconfig/CONFIG_DRM_VMWGFX_FBCON b/baseconfig/x86/CONFIG_DRM_VMWGFX_FBCON
index cc51e115d..cc51e115d 100644
--- a/baseconfig/CONFIG_DRM_VMWGFX_FBCON
+++ b/baseconfig/x86/CONFIG_DRM_VMWGFX_FBCON
diff --git a/baseconfig/CONFIG_IB700_WDT b/baseconfig/x86/CONFIG_IB700_WDT
index 3cf068abd..3cf068abd 100644
--- a/baseconfig/CONFIG_IB700_WDT
+++ b/baseconfig/x86/CONFIG_IB700_WDT
diff --git a/baseconfig/CONFIG_IBMASR b/baseconfig/x86/CONFIG_IBMASR
index c5d4eb253..c5d4eb253 100644
--- a/baseconfig/CONFIG_IBMASR
+++ b/baseconfig/x86/CONFIG_IBMASR
diff --git a/baseconfig/CONFIG_INTEL_MENLOW b/baseconfig/x86/CONFIG_INTEL_MENLOW
index 342cd294b..342cd294b 100644
--- a/baseconfig/CONFIG_INTEL_MENLOW
+++ b/baseconfig/x86/CONFIG_INTEL_MENLOW
diff --git a/baseconfig/CONFIG_VMWARE_BALLOON b/baseconfig/x86/CONFIG_VMWARE_BALLOON
index 324a0cebc..324a0cebc 100644
--- a/baseconfig/CONFIG_VMWARE_BALLOON
+++ b/baseconfig/x86/CONFIG_VMWARE_BALLOON
diff --git a/baseconfig/CONFIG_VMWARE_PVSCSI b/baseconfig/x86/CONFIG_VMWARE_PVSCSI
index 3568e9188..3568e9188 100644
--- a/baseconfig/CONFIG_VMWARE_PVSCSI
+++ b/baseconfig/x86/CONFIG_VMWARE_PVSCSI
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 326dff36e..42967737a 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1235,14 +1235,6 @@ CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_GVT_KVMGT=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
@@ -1289,8 +1281,6 @@ CONFIG_DRM_VC4=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_VMWGFX_FBCON=y
-# CONFIG_DRM_VMWGFX is not set
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DT3155 is not set
@@ -2009,8 +1999,6 @@ CONFIG_I40EVF=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_I82092=m
 # CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDE is not set
@@ -2187,7 +2175,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=m
 # CONFIG_INTEGRITY is not set
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_INTEL_MENLOW is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
@@ -6099,8 +6086,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VLSI_FIR=m
 # CONFIG_VME_BUS is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VORTEX=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 5ef00d93a..86cb4c02c 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1225,14 +1225,6 @@ CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_GVT_KVMGT=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
@@ -1279,8 +1271,6 @@ CONFIG_DRM_VC4=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_VMWGFX_FBCON=y
-# CONFIG_DRM_VMWGFX is not set
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DT3155 is not set
@@ -1992,8 +1982,6 @@ CONFIG_I40EVF=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_I82092=m
 # CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDE is not set
@@ -2170,7 +2158,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=m
 # CONFIG_INTEGRITY is not set
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_INTEL_MENLOW is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
@@ -6076,8 +6063,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VLSI_FIR=m
 # CONFIG_VME_BUS is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VORTEX=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 212fd1cb3..7a60d3d39 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1332,14 +1332,6 @@ CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_GVT_KVMGT=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_USERPTR=y
 CONFIG_DRM_IMX_HDMI=m
 CONFIG_DRM_IMX_IPUV3=m
 CONFIG_DRM_IMX_LDB=m
@@ -1412,8 +1404,6 @@ CONFIG_DRM_VC4=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_VMWGFX_FBCON=y
-# CONFIG_DRM_VMWGFX is not set
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DT3155 is not set
@@ -2165,8 +2155,6 @@ CONFIG_I40EVF=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_I82092=m
 # CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDE is not set
@@ -2361,7 +2349,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=m
 # CONFIG_INTEGRITY is not set
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_INTEL_MENLOW is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
@@ -6707,8 +6694,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VLSI_FIR=m
 # CONFIG_VME_BUS is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VORTEX=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 96803968f..61875ddcb 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1280,14 +1280,6 @@ CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_GVT_KVMGT=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_IMX is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
@@ -1335,8 +1327,6 @@ CONFIG_DRM_VC4=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_VMWGFX_FBCON=y
-# CONFIG_DRM_VMWGFX is not set
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DT3155 is not set
@@ -2063,8 +2053,6 @@ CONFIG_I40EVF=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_I82092=m
 # CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDE is not set
@@ -2244,7 +2232,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=m
 # CONFIG_INTEGRITY is not set
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_INTEL_MENLOW is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
@@ -6282,8 +6269,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VLSI_FIR=m
 # CONFIG_VME_BUS is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VORTEX=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index e1bee0da3..7c84a17e6 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1270,14 +1270,6 @@ CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_GVT_KVMGT=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_IMX is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
@@ -1325,8 +1317,6 @@ CONFIG_DRM_VC4=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_VMWGFX_FBCON=y
-# CONFIG_DRM_VMWGFX is not set
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DT3155 is not set
@@ -2046,8 +2036,6 @@ CONFIG_I40EVF=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_I82092=m
 # CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDE is not set
@@ -2227,7 +2215,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=m
 # CONFIG_INTEGRITY is not set
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_INTEL_MENLOW is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
@@ -6259,8 +6246,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VLSI_FIR=m
 # CONFIG_VME_BUS is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VORTEX=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index e7d7586d1..5aa8b2698 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1322,14 +1322,6 @@ CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_GVT_KVMGT=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_USERPTR=y
 CONFIG_DRM_IMX_HDMI=m
 CONFIG_DRM_IMX_IPUV3=m
 CONFIG_DRM_IMX_LDB=m
@@ -1402,8 +1394,6 @@ CONFIG_DRM_VC4=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_VMWGFX_FBCON=y
-# CONFIG_DRM_VMWGFX is not set
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DT3155 is not set
@@ -2148,8 +2138,6 @@ CONFIG_I40EVF=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_I82092=m
 # CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDE is not set
@@ -2344,7 +2332,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=m
 # CONFIG_INTEGRITY is not set
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_INTEL_MENLOW is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
@@ -6684,8 +6671,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VLSI_FIR=m
 # CONFIG_VME_BUS is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VORTEX=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index f8eca8a22..1737ce557 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -1118,7 +1118,6 @@ CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
-# CONFIG_DRM_MALI_DISPLAY is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 050de6842..6c49be27d 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -1129,7 +1129,6 @@ CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
-# CONFIG_DRM_MALI_DISPLAY is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index c73211bac..d65d9d64b 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1129,7 +1129,6 @@ CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
-# CONFIG_DRM_MALI_DISPLAY is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 04852c4be..9e63782d5 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1118,7 +1118,6 @@ CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
-# CONFIG_DRM_MALI_DISPLAY is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 2a6cec8c4..d7b42b3f4 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -1082,18 +1082,9 @@ CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_GVT_KVMGT=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
-# CONFIG_DRM_MALI_DISPLAY is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1121,8 +1112,6 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_VMWGFX=m
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DT3155 is not set
@@ -1817,8 +1806,6 @@ CONFIG_I40EVF=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_I82092=m
 # CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
 CONFIG_IBM_BSR=m
 CONFIG_IBMEBUS=y
 # CONFIG_IBM_EMAC is not set
@@ -1999,7 +1986,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=m
 # CONFIG_INTEGRITY is not set
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_INTEL_MENLOW is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
@@ -5593,8 +5579,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VLSI_FIR=m
 # CONFIG_VME_BUS is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VORTEX=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index b98c1e749..f5a331aad 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -1071,18 +1071,9 @@ CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_GVT_KVMGT=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
-# CONFIG_DRM_MALI_DISPLAY is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1110,8 +1101,6 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_VMWGFX=m
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DT3155 is not set
@@ -1799,8 +1788,6 @@ CONFIG_I40EVF=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_I82092=m
 # CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
 CONFIG_IBM_BSR=m
 CONFIG_IBMEBUS=y
 # CONFIG_IBM_EMAC is not set
@@ -1981,7 +1968,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=m
 # CONFIG_INTEGRITY is not set
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_INTEL_MENLOW is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
@@ -5569,8 +5555,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VLSI_FIR=m
 # CONFIG_VME_BUS is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VORTEX=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index b09390184..20d6620bc 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1038,18 +1038,9 @@ CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_GVT_KVMGT=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
-# CONFIG_DRM_MALI_DISPLAY is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1077,8 +1068,6 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_VMWGFX=m
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DT3155 is not set
@@ -1769,8 +1758,6 @@ CONFIG_I40EVF=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_I82092=m
 # CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
 CONFIG_IBM_BSR=m
 CONFIG_IBMEBUS=y
 # CONFIG_IBM_EMAC is not set
@@ -1945,7 +1932,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=m
 # CONFIG_INTEGRITY is not set
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_INTEL_MENLOW is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
@@ -5522,8 +5508,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VLSI_FIR=m
 # CONFIG_VME_BUS is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VORTEX=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 0a00d0798..ccd4e4328 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1027,18 +1027,9 @@ CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_GVT_KVMGT=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
-# CONFIG_DRM_MALI_DISPLAY is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1066,8 +1057,6 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_VMWGFX=m
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DT3155 is not set
@@ -1751,8 +1740,6 @@ CONFIG_I40EVF=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_I82092=m
 # CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
 CONFIG_IBM_BSR=m
 CONFIG_IBMEBUS=y
 # CONFIG_IBM_EMAC is not set
@@ -1927,7 +1914,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=m
 # CONFIG_INTEGRITY is not set
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_INTEL_MENLOW is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
@@ -5498,8 +5484,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VLSI_FIR=m
 # CONFIG_VME_BUS is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VORTEX=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 8eac87e07..b8fba01fb 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -1037,18 +1037,9 @@ CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_GVT_KVMGT=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
-# CONFIG_DRM_MALI_DISPLAY is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1076,8 +1067,6 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_VMWGFX=m
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DT3155 is not set
@@ -1768,8 +1757,6 @@ CONFIG_I40EVF=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_I82092=m
 # CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
 CONFIG_IBM_BSR=m
 CONFIG_IBMEBUS=y
 # CONFIG_IBM_EMAC is not set
@@ -1944,7 +1931,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=m
 # CONFIG_INTEGRITY is not set
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_INTEL_MENLOW is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
@@ -5521,8 +5507,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VLSI_FIR=m
 # CONFIG_VME_BUS is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VORTEX=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 0a26a33d8..71d2d249e 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -1026,18 +1026,9 @@ CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_GVT_KVMGT=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
-# CONFIG_DRM_MALI_DISPLAY is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1065,8 +1056,6 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_VMWGFX=m
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DT3155 is not set
@@ -1750,8 +1739,6 @@ CONFIG_I40EVF=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_I82092=m
 # CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
 CONFIG_IBM_BSR=m
 CONFIG_IBMEBUS=y
 # CONFIG_IBM_EMAC is not set
@@ -1926,7 +1913,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=m
 # CONFIG_INTEGRITY is not set
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_INTEL_MENLOW is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
@@ -5497,8 +5483,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VLSI_FIR=m
 # CONFIG_VME_BUS is not set
-CONFIG_VMWARE_BALLOON=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VORTEX=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 1e8740466..aa07540fe 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1033,18 +1033,9 @@ CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_GVT_KVMGT=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-# CONFIG_DRM_MALI_DISPLAY is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1072,8 +1063,6 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_VMWGFX=m
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DT3155 is not set
@@ -1722,8 +1711,6 @@ CONFIG_I40EVF=m
 # CONFIG_I6300ESB_WDT is not set
 CONFIG_I82092=m
 # CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
 CONFIG_IBM_PARTITION=y
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
@@ -1893,7 +1880,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=m
 # CONFIG_INTEGRITY is not set
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_INTEL_MENLOW is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
@@ -5411,8 +5397,6 @@ CONFIG_VLSI_FIR=m
 CONFIG_VMCP=y
 # CONFIG_VME_BUS is not set
 CONFIG_VMLOGRDR=m
-CONFIG_VMWARE_BALLOON=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VORTEX=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 639889b55..41aec9bdd 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1022,18 +1022,9 @@ CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_GVT_KVMGT=m
-CONFIG_DRM_I915_GVT=y
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-# CONFIG_DRM_MALI_DISPLAY is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1061,8 +1052,6 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_VMWGFX=m
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_DT3155 is not set
@@ -1704,8 +1693,6 @@ CONFIG_I40EVF=m
 # CONFIG_I6300ESB_WDT is not set
 CONFIG_I82092=m
 # CONFIG_IAQCORE is not set
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
 CONFIG_IBM_PARTITION=y
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
@@ -1875,7 +1862,6 @@ CONFIG_INPUT=y
 CONFIG_INPUT_YEALINK=m
 # CONFIG_INTEGRITY is not set
 # CONFIG_INTEL_IDMA64 is not set
-# CONFIG_INTEL_MENLOW is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
@@ -5387,8 +5373,6 @@ CONFIG_VLSI_FIR=m
 CONFIG_VMCP=y
 # CONFIG_VME_BUS is not set
 CONFIG_VMLOGRDR=m
-CONFIG_VMWARE_BALLOON=m
-CONFIG_VMWARE_PVSCSI=m
 # CONFIG_VMXNET3 is not set
 CONFIG_VORTEX=m
 CONFIG_VSOCKETS=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 2488ea90a..8608267ba 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1161,7 +1161,6 @@ CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
-# CONFIG_DRM_MALI_DISPLAY is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index d70b202f0..a4dafb582 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1150,7 +1150,6 @@ CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
-# CONFIG_DRM_MALI_DISPLAY is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m