summaryrefslogtreecommitdiffstats
path: root/baseconfig
diff options
context:
space:
mode:
Diffstat (limited to 'baseconfig')
-rw-r--r--baseconfig/CONFIG_ARCH_TEGRA_186_SOC1
-rw-r--r--baseconfig/CONFIG_BATTERY_GOLDFISH1
-rw-r--r--baseconfig/CONFIG_DRM_MALI_DISPLAY1
-rw-r--r--baseconfig/CONFIG_FB_GOLDFISH1
-rw-r--r--baseconfig/CONFIG_I2C_IMX_LPI2C1
-rw-r--r--baseconfig/CONFIG_MESON_GXL_PHY1
-rw-r--r--baseconfig/CONFIG_MFD_SUN4I_GPADC1
-rw-r--r--baseconfig/CONFIG_SND_SUN8I_CODEC_ANALOG1
-rw-r--r--baseconfig/CONFIG_SUN50I_A64_CCU1
-rw-r--r--baseconfig/CONFIG_SUN6I_A31_CCU1
-rw-r--r--baseconfig/CONFIG_SUN8I_A23_CCU1
-rw-r--r--baseconfig/CONFIG_SUN8I_A33_CCU1
-rw-r--r--baseconfig/CONFIG_SUNXI_CCU1
-rw-r--r--baseconfig/arm/CONFIG_DRM_MESON (renamed from baseconfig/arm/arm64/CONFIG_DRM_MESON)0
-rw-r--r--baseconfig/arm/CONFIG_DRM_VMWGFX1
-rw-r--r--baseconfig/arm/CONFIG_DWMAC_DWC_QOS_ETH (renamed from baseconfig/arm/armv7/CONFIG_DWMAC_DWC_QOS_ETH)0
-rw-r--r--baseconfig/arm/CONFIG_DWMAC_GENERIC (renamed from baseconfig/arm/armv7/CONFIG_DWMAC_GENERIC)0
-rw-r--r--baseconfig/arm/CONFIG_DWMAC_IPQ806X1
-rw-r--r--baseconfig/arm/CONFIG_MESON_SARADC1
-rw-r--r--baseconfig/arm/CONFIG_MFD_SUN4I_GPADC1
-rw-r--r--baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG1
-rw-r--r--baseconfig/arm/CONFIG_STMMAC_PLATFORM (renamed from baseconfig/arm/armv7/CONFIG_STMMAC_PLATFORM)0
-rw-r--r--baseconfig/arm/arm64/CONFIG_ARCH_MESON1
-rw-r--r--baseconfig/arm/arm64/CONFIG_ARM64_4K_PAGES1
-rw-r--r--baseconfig/arm/arm64/CONFIG_ARM64_64K_PAGES1
-rw-r--r--baseconfig/arm/arm64/CONFIG_COMPAT1
-rw-r--r--baseconfig/arm/arm64/CONFIG_DWMAC_IPQ806X1
-rw-r--r--baseconfig/arm/arm64/CONFIG_DWMAC_SUNXI1
-rw-r--r--baseconfig/arm/arm64/CONFIG_PHY_SUN4I_USB2
-rw-r--r--baseconfig/arm/arm64/CONFIG_TEGRA_IVC (renamed from baseconfig/CONFIG_TEGRA_IVC)0
-rw-r--r--baseconfig/arm/armv7/CONFIG_ARCH_MESON1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DRM_MESON1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DRM_STI2
-rw-r--r--baseconfig/arm/armv7/CONFIG_MACH_MESON61
-rw-r--r--baseconfig/arm/armv7/CONFIG_MACH_MESON81
-rw-r--r--baseconfig/arm/armv7/CONFIG_MACH_MESON8B1
-rw-r--r--baseconfig/arm/armv7/CONFIG_TEGRA_IVC1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X1
-rw-r--r--baseconfig/x86/CONFIG_DRM_I810 (renamed from baseconfig/CONFIG_DRM_I810)0
-rw-r--r--baseconfig/x86/CONFIG_DRM_I915 (renamed from baseconfig/CONFIG_DRM_I915)0
-rw-r--r--baseconfig/x86/CONFIG_DRM_I915_ALPHA_SUPPORT (renamed from baseconfig/CONFIG_DRM_I915_ALPHA_SUPPORT)0
-rw-r--r--baseconfig/x86/CONFIG_DRM_I915_CAPTURE_ERROR (renamed from baseconfig/CONFIG_DRM_I915_CAPTURE_ERROR)0
-rw-r--r--baseconfig/x86/CONFIG_DRM_I915_COMPRESS_ERROR (renamed from baseconfig/CONFIG_DRM_I915_COMPRESS_ERROR)0
-rw-r--r--baseconfig/x86/CONFIG_DRM_I915_GVT (renamed from baseconfig/CONFIG_DRM_I915_GVT)0
-rw-r--r--baseconfig/x86/CONFIG_DRM_I915_GVT_KVMGT (renamed from baseconfig/CONFIG_DRM_I915_GVT_KVMGT)0
-rw-r--r--baseconfig/x86/CONFIG_DRM_I915_USERPTR (renamed from baseconfig/CONFIG_DRM_I915_USERPTR)0
-rw-r--r--baseconfig/x86/CONFIG_DRM_VMWGFX (renamed from baseconfig/CONFIG_DRM_VMWGFX)0
-rw-r--r--baseconfig/x86/CONFIG_DRM_VMWGFX_FBCON (renamed from baseconfig/CONFIG_DRM_VMWGFX_FBCON)0
-rw-r--r--baseconfig/x86/CONFIG_FB_ARC (renamed from baseconfig/CONFIG_FB_ARC)0
-rw-r--r--baseconfig/x86/CONFIG_FB_GEODE (renamed from baseconfig/CONFIG_FB_GEODE)0
-rw-r--r--baseconfig/x86/CONFIG_FB_HGA (renamed from baseconfig/CONFIG_FB_HGA)0
-rw-r--r--baseconfig/x86/CONFIG_FB_I810 (renamed from baseconfig/CONFIG_FB_I810)0
-rw-r--r--baseconfig/x86/CONFIG_FB_I810_GTF (renamed from baseconfig/CONFIG_FB_I810_GTF)0
-rw-r--r--baseconfig/x86/CONFIG_FB_I810_I2C (renamed from baseconfig/CONFIG_FB_I810_I2C)0
-rw-r--r--baseconfig/x86/CONFIG_FB_LE80578 (renamed from baseconfig/CONFIG_FB_LE80578)0
-rw-r--r--baseconfig/x86/CONFIG_FB_VGA16 (renamed from baseconfig/CONFIG_FB_VGA16)0
-rw-r--r--baseconfig/x86/CONFIG_FB_VIA (renamed from baseconfig/CONFIG_FB_VIA)0
-rw-r--r--baseconfig/x86/CONFIG_FB_VIA_DIRECT_PROCFS (renamed from baseconfig/CONFIG_FB_VIA_DIRECT_PROCFS)0
-rw-r--r--baseconfig/x86/CONFIG_IB700_WDT (renamed from baseconfig/CONFIG_IB700_WDT)0
-rw-r--r--baseconfig/x86/CONFIG_IBMASR (renamed from baseconfig/CONFIG_IBMASR)0
-rw-r--r--baseconfig/x86/CONFIG_INTEL_MENLOW (renamed from baseconfig/CONFIG_INTEL_MENLOW)0
-rw-r--r--baseconfig/x86/CONFIG_VMWARE_BALLOON (renamed from baseconfig/CONFIG_VMWARE_BALLOON)0
-rw-r--r--baseconfig/x86/CONFIG_VMWARE_PVSCSI (renamed from baseconfig/CONFIG_VMWARE_PVSCSI)0
63 files changed, 12 insertions, 23 deletions
diff --git a/baseconfig/CONFIG_ARCH_TEGRA_186_SOC b/baseconfig/CONFIG_ARCH_TEGRA_186_SOC
deleted file mode 100644
index 0439db330..000000000
--- a/baseconfig/CONFIG_ARCH_TEGRA_186_SOC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARCH_TEGRA_186_SOC is not set
diff --git a/baseconfig/CONFIG_BATTERY_GOLDFISH b/baseconfig/CONFIG_BATTERY_GOLDFISH
deleted file mode 100644
index 75b9c00e9..000000000
--- a/baseconfig/CONFIG_BATTERY_GOLDFISH
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BATTERY_GOLDFISH is not set
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/CONFIG_FB_GOLDFISH b/baseconfig/CONFIG_FB_GOLDFISH
deleted file mode 100644
index 522a715d1..000000000
--- a/baseconfig/CONFIG_FB_GOLDFISH
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_GOLDFISH is not set
diff --git a/baseconfig/CONFIG_I2C_IMX_LPI2C b/baseconfig/CONFIG_I2C_IMX_LPI2C
deleted file mode 100644
index 2d866d55f..000000000
--- a/baseconfig/CONFIG_I2C_IMX_LPI2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_IMX_LPI2C=m
diff --git a/baseconfig/CONFIG_MESON_GXL_PHY b/baseconfig/CONFIG_MESON_GXL_PHY
deleted file mode 100644
index cc59580cc..000000000
--- a/baseconfig/CONFIG_MESON_GXL_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MESON_GXL_PHY=m
diff --git a/baseconfig/CONFIG_MFD_SUN4I_GPADC b/baseconfig/CONFIG_MFD_SUN4I_GPADC
deleted file mode 100644
index d156cb188..000000000
--- a/baseconfig/CONFIG_MFD_SUN4I_GPADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_SUN4I_GPADC=m
diff --git a/baseconfig/CONFIG_SND_SUN8I_CODEC_ANALOG b/baseconfig/CONFIG_SND_SUN8I_CODEC_ANALOG
deleted file mode 100644
index 28ea30190..000000000
--- a/baseconfig/CONFIG_SND_SUN8I_CODEC_ANALOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
diff --git a/baseconfig/CONFIG_SUN50I_A64_CCU b/baseconfig/CONFIG_SUN50I_A64_CCU
deleted file mode 100644
index 9ce6c792a..000000000
--- a/baseconfig/CONFIG_SUN50I_A64_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUN50I_A64_CCU is not set
diff --git a/baseconfig/CONFIG_SUN6I_A31_CCU b/baseconfig/CONFIG_SUN6I_A31_CCU
deleted file mode 100644
index 5ce1bb3f7..000000000
--- a/baseconfig/CONFIG_SUN6I_A31_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUN6I_A31_CCU is not set
diff --git a/baseconfig/CONFIG_SUN8I_A23_CCU b/baseconfig/CONFIG_SUN8I_A23_CCU
deleted file mode 100644
index 26ae1100c..000000000
--- a/baseconfig/CONFIG_SUN8I_A23_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUN8I_A23_CCU is not set
diff --git a/baseconfig/CONFIG_SUN8I_A33_CCU b/baseconfig/CONFIG_SUN8I_A33_CCU
deleted file mode 100644
index e1a357ee8..000000000
--- a/baseconfig/CONFIG_SUN8I_A33_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUN8I_A33_CCU is not set
diff --git a/baseconfig/CONFIG_SUNXI_CCU b/baseconfig/CONFIG_SUNXI_CCU
deleted file mode 100644
index a383113ef..000000000
--- a/baseconfig/CONFIG_SUNXI_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUNXI_CCU is not set
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MESON b/baseconfig/arm/CONFIG_DRM_MESON
index 638714333..638714333 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MESON
+++ b/baseconfig/arm/CONFIG_DRM_MESON
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/arm/armv7/CONFIG_DWMAC_DWC_QOS_ETH b/baseconfig/arm/CONFIG_DWMAC_DWC_QOS_ETH
index 6ed7a8e38..6ed7a8e38 100644
--- a/baseconfig/arm/armv7/CONFIG_DWMAC_DWC_QOS_ETH
+++ b/baseconfig/arm/CONFIG_DWMAC_DWC_QOS_ETH
diff --git a/baseconfig/arm/armv7/CONFIG_DWMAC_GENERIC b/baseconfig/arm/CONFIG_DWMAC_GENERIC
index fe2550e2b..fe2550e2b 100644
--- a/baseconfig/arm/armv7/CONFIG_DWMAC_GENERIC
+++ b/baseconfig/arm/CONFIG_DWMAC_GENERIC
diff --git a/baseconfig/arm/CONFIG_DWMAC_IPQ806X b/baseconfig/arm/CONFIG_DWMAC_IPQ806X
deleted file mode 100644
index ce2bf0c43..000000000
--- a/baseconfig/arm/CONFIG_DWMAC_IPQ806X
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DWMAC_IPQ806X is not set
diff --git a/baseconfig/arm/CONFIG_MESON_SARADC b/baseconfig/arm/CONFIG_MESON_SARADC
new file mode 100644
index 000000000..cae134290
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MESON_SARADC
@@ -0,0 +1 @@
+CONFIG_MESON_SARADC=m
diff --git a/baseconfig/arm/CONFIG_MFD_SUN4I_GPADC b/baseconfig/arm/CONFIG_MFD_SUN4I_GPADC
deleted file mode 100644
index d156cb188..000000000
--- a/baseconfig/arm/CONFIG_MFD_SUN4I_GPADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_SUN4I_GPADC=m
diff --git a/baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG b/baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG
deleted file mode 100644
index 28ea30190..000000000
--- a/baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
diff --git a/baseconfig/arm/armv7/CONFIG_STMMAC_PLATFORM b/baseconfig/arm/CONFIG_STMMAC_PLATFORM
index 2ad238de4..2ad238de4 100644
--- a/baseconfig/arm/armv7/CONFIG_STMMAC_PLATFORM
+++ b/baseconfig/arm/CONFIG_STMMAC_PLATFORM
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_MESON b/baseconfig/arm/arm64/CONFIG_ARCH_MESON
deleted file mode 100644
index 849319f60..000000000
--- a/baseconfig/arm/arm64/CONFIG_ARCH_MESON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARCH_MESON is not set
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_4K_PAGES b/baseconfig/arm/arm64/CONFIG_ARM64_4K_PAGES
new file mode 100644
index 000000000..5df91df1a
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_ARM64_4K_PAGES
@@ -0,0 +1 @@
+CONFIG_ARM64_4K_PAGES=y
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_64K_PAGES b/baseconfig/arm/arm64/CONFIG_ARM64_64K_PAGES
deleted file mode 100644
index bda5426de..000000000
--- a/baseconfig/arm/arm64/CONFIG_ARM64_64K_PAGES
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARM64_64K_PAGES=y
diff --git a/baseconfig/arm/arm64/CONFIG_COMPAT b/baseconfig/arm/arm64/CONFIG_COMPAT
new file mode 100644
index 000000000..3e041f1b6
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_COMPAT
@@ -0,0 +1 @@
+# CONFIG_COMPAT is not set
diff --git a/baseconfig/arm/arm64/CONFIG_DWMAC_IPQ806X b/baseconfig/arm/arm64/CONFIG_DWMAC_IPQ806X
new file mode 100644
index 000000000..49177a6db
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_DWMAC_IPQ806X
@@ -0,0 +1 @@
+CONFIG_DWMAC_IPQ806X=m
diff --git a/baseconfig/arm/arm64/CONFIG_DWMAC_SUNXI b/baseconfig/arm/arm64/CONFIG_DWMAC_SUNXI
new file mode 100644
index 000000000..254fc7d8a
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_DWMAC_SUNXI
@@ -0,0 +1 @@
+CONFIG_DWMAC_SUNXI=m
diff --git a/baseconfig/arm/arm64/CONFIG_PHY_SUN4I_USB b/baseconfig/arm/arm64/CONFIG_PHY_SUN4I_USB
index a6a26dd17..f619228c3 100644
--- a/baseconfig/arm/arm64/CONFIG_PHY_SUN4I_USB
+++ b/baseconfig/arm/arm64/CONFIG_PHY_SUN4I_USB
@@ -1 +1 @@
-# CONFIG_PHY_SUN4I_USB is not set
+CONFIG_PHY_SUN4I_USB=m
diff --git a/baseconfig/CONFIG_TEGRA_IVC b/baseconfig/arm/arm64/CONFIG_TEGRA_IVC
index cdcacbec2..cdcacbec2 100644
--- a/baseconfig/CONFIG_TEGRA_IVC
+++ b/baseconfig/arm/arm64/CONFIG_TEGRA_IVC
diff --git a/baseconfig/arm/armv7/CONFIG_ARCH_MESON b/baseconfig/arm/armv7/CONFIG_ARCH_MESON
deleted file mode 100644
index 849319f60..000000000
--- a/baseconfig/arm/armv7/CONFIG_ARCH_MESON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARCH_MESON is not set
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_MESON b/baseconfig/arm/armv7/CONFIG_DRM_MESON
deleted file mode 100644
index 7a6179102..000000000
--- a/baseconfig/arm/armv7/CONFIG_DRM_MESON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_MESON is not set
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_STI b/baseconfig/arm/armv7/CONFIG_DRM_STI
index 008714f93..d16e09b9b 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_STI
+++ b/baseconfig/arm/armv7/CONFIG_DRM_STI
@@ -1 +1 @@
-# CONFIG_DRM_STI is not set
+CONFIG_DRM_STI=m
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_MESON6 b/baseconfig/arm/armv7/CONFIG_MACH_MESON6
new file mode 100644
index 000000000..aff440cc5
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MACH_MESON6
@@ -0,0 +1 @@
+# CONFIG_MACH_MESON6 is not set
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_MESON8 b/baseconfig/arm/armv7/CONFIG_MACH_MESON8
new file mode 100644
index 000000000..e55c72211
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MACH_MESON8
@@ -0,0 +1 @@
+# CONFIG_MACH_MESON8 is not set
diff --git a/baseconfig/arm/armv7/CONFIG_MACH_MESON8B b/baseconfig/arm/armv7/CONFIG_MACH_MESON8B
new file mode 100644
index 000000000..5212d2aca
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MACH_MESON8B
@@ -0,0 +1 @@
+CONFIG_MACH_MESON8B=y
diff --git a/baseconfig/arm/armv7/CONFIG_TEGRA_IVC b/baseconfig/arm/armv7/CONFIG_TEGRA_IVC
new file mode 100644
index 000000000..cdcacbec2
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_TEGRA_IVC
@@ -0,0 +1 @@
+CONFIG_TEGRA_IVC=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X b/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X
new file mode 100644
index 000000000..49177a6db
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_DWMAC_IPQ806X
@@ -0,0 +1 @@
+CONFIG_DWMAC_IPQ806X=m
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_FB_ARC b/baseconfig/x86/CONFIG_FB_ARC
index 1d66b92f4..1d66b92f4 100644
--- a/baseconfig/CONFIG_FB_ARC
+++ b/baseconfig/x86/CONFIG_FB_ARC
diff --git a/baseconfig/CONFIG_FB_GEODE b/baseconfig/x86/CONFIG_FB_GEODE
index 3c78c584d..3c78c584d 100644
--- a/baseconfig/CONFIG_FB_GEODE
+++ b/baseconfig/x86/CONFIG_FB_GEODE
diff --git a/baseconfig/CONFIG_FB_HGA b/baseconfig/x86/CONFIG_FB_HGA
index 3c3142a1e..3c3142a1e 100644
--- a/baseconfig/CONFIG_FB_HGA
+++ b/baseconfig/x86/CONFIG_FB_HGA
diff --git a/baseconfig/CONFIG_FB_I810 b/baseconfig/x86/CONFIG_FB_I810
index 9ef6eca18..9ef6eca18 100644
--- a/baseconfig/CONFIG_FB_I810
+++ b/baseconfig/x86/CONFIG_FB_I810
diff --git a/baseconfig/CONFIG_FB_I810_GTF b/baseconfig/x86/CONFIG_FB_I810_GTF
index 71eee1202..71eee1202 100644
--- a/baseconfig/CONFIG_FB_I810_GTF
+++ b/baseconfig/x86/CONFIG_FB_I810_GTF
diff --git a/baseconfig/CONFIG_FB_I810_I2C b/baseconfig/x86/CONFIG_FB_I810_I2C
index 7cfe05740..7cfe05740 100644
--- a/baseconfig/CONFIG_FB_I810_I2C
+++ b/baseconfig/x86/CONFIG_FB_I810_I2C
diff --git a/baseconfig/CONFIG_FB_LE80578 b/baseconfig/x86/CONFIG_FB_LE80578
index 327044a84..327044a84 100644
--- a/baseconfig/CONFIG_FB_LE80578
+++ b/baseconfig/x86/CONFIG_FB_LE80578
diff --git a/baseconfig/CONFIG_FB_VGA16 b/baseconfig/x86/CONFIG_FB_VGA16
index 4fa33dfdc..4fa33dfdc 100644
--- a/baseconfig/CONFIG_FB_VGA16
+++ b/baseconfig/x86/CONFIG_FB_VGA16
diff --git a/baseconfig/CONFIG_FB_VIA b/baseconfig/x86/CONFIG_FB_VIA
index d34242c33..d34242c33 100644
--- a/baseconfig/CONFIG_FB_VIA
+++ b/baseconfig/x86/CONFIG_FB_VIA
diff --git a/baseconfig/CONFIG_FB_VIA_DIRECT_PROCFS b/baseconfig/x86/CONFIG_FB_VIA_DIRECT_PROCFS
index d2ff4278d..d2ff4278d 100644
--- a/baseconfig/CONFIG_FB_VIA_DIRECT_PROCFS
+++ b/baseconfig/x86/CONFIG_FB_VIA_DIRECT_PROCFS
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