summaryrefslogtreecommitdiffstats
path: root/baseconfig/x86
diff options
context:
space:
mode:
authorDon Zickus <dzickus@redhat.com>2017-11-06 16:40:39 -0500
committerLaura Abbott <labbott@redhat.com>2017-11-13 09:39:12 -0800
commitc54d82caa97d0d11e06f263f92394479bf3bb437 (patch)
tree7c5e484b5a50d517e782dad4a6bdb5bb4bfe13a4 /baseconfig/x86
parent36ae66c549a5da472615f2974bb7c7fc18843d4c (diff)
downloadkernel-c54d82caa97d0d11e06f263f92394479bf3bb437.tar.gz
kernel-c54d82caa97d0d11e06f263f92394479bf3bb437.tar.xz
kernel-c54d82caa97d0d11e06f263f92394479bf3bb437.zip
configs: Rename config directories to sub-directory
As part of an effort to foster better cross collaboration with internal Red Hat kernels, align the configs layout to match that kernel. This will allow Red Hat engineers to provide easier guidance on how to set various config options. In addition, the scripts that process the config options will migrate to the configs/ directory too in later patches. Future config workflows will stage all work in the configs/ area. A simple diff between the kernels will easily expose which config options are different. Reading the comments in the file provides guidance to Fedora to determine if that kernel should make a similar change or not. Rename debugconfig -> configs/base-debug Rename baseconfig -> configs/base-generic Rename configs/base-generic/arm/arm64 -> configs/base-generic/arm/aarch64 No code changes made.
Diffstat (limited to 'baseconfig/x86')
-rw-r--r--baseconfig/x86/CONFIG_ACERHDF1
-rw-r--r--baseconfig/x86/CONFIG_ACER_WMI1
-rw-r--r--baseconfig/x86/CONFIG_ACPI1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_AC1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_APEI1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_APEI_EINJ1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_APEI_ERST_DEBUG1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_APEI_GHES1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_APEI_MEMORY_FAILURE1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_APEI_PCIEAER1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_BATTERY1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_BGRT1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_BUTTON1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_CMPC1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_CONFIGFS1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_CONTAINER1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_CUSTOM_METHOD1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_DOCK1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_EC_DEBUGFS1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_EXTLOG1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_FAN1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_HED1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_I2C_OPREGION1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_IPMI1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_PROCESSOR1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_PROCESSOR_AGGREGATOR1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_PROCFS1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_PROCFS_POWER1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_SBS1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_SLEEP1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_TABLE_UPGRADE1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_THERMAL1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_TOSHIBA1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_VIDEO1
-rw-r--r--baseconfig/x86/CONFIG_ACPI_WMI1
-rw-r--r--baseconfig/x86/CONFIG_AGP1
-rw-r--r--baseconfig/x86/CONFIG_AGP_ALI1
-rw-r--r--baseconfig/x86/CONFIG_AGP_AMD1
-rw-r--r--baseconfig/x86/CONFIG_AGP_AMD641
-rw-r--r--baseconfig/x86/CONFIG_AGP_ATI1
-rw-r--r--baseconfig/x86/CONFIG_AGP_EFFICEON1
-rw-r--r--baseconfig/x86/CONFIG_AGP_INTEL1
-rw-r--r--baseconfig/x86/CONFIG_AGP_NVIDIA1
-rw-r--r--baseconfig/x86/CONFIG_AGP_SIS1
-rw-r--r--baseconfig/x86/CONFIG_AGP_SWORKS1
-rw-r--r--baseconfig/x86/CONFIG_AGP_VIA1
-rw-r--r--baseconfig/x86/CONFIG_ALIENWARE_WMI1
-rw-r--r--baseconfig/x86/CONFIG_AMD_XGBE1
-rw-r--r--baseconfig/x86/CONFIG_AMD_XGBE_DCB1
-rw-r--r--baseconfig/x86/CONFIG_AMILO_RFKILL1
-rw-r--r--baseconfig/x86/CONFIG_APPLE_GMUX1
-rw-r--r--baseconfig/x86/CONFIG_APPLE_PROPERTIES1
-rw-r--r--baseconfig/x86/CONFIG_ASUS_LAPTOP1
-rw-r--r--baseconfig/x86/CONFIG_ASUS_NB_WMI1
-rw-r--r--baseconfig/x86/CONFIG_ASUS_WIRELESS1
-rw-r--r--baseconfig/x86/CONFIG_ASUS_WMI1
-rw-r--r--baseconfig/x86/CONFIG_ATA_ACPI1
-rw-r--r--baseconfig/x86/CONFIG_BACKLIGHT_APPLE1
-rw-r--r--baseconfig/x86/CONFIG_BLK_DEV_AMD74XX1
-rw-r--r--baseconfig/x86/CONFIG_BLK_DEV_PCIESSD_MTIP32XX1
-rw-r--r--baseconfig/x86/CONFIG_BXT_WC_PMIC_OPREGION1
-rw-r--r--baseconfig/x86/CONFIG_CAPI_EICON1
-rw-r--r--baseconfig/x86/CONFIG_CC_STACKPROTECTOR1
-rw-r--r--baseconfig/x86/CONFIG_CC_STACKPROTECTOR_STRONG1
-rw-r--r--baseconfig/x86/CONFIG_CHROMEOS_LAPTOP1
-rw-r--r--baseconfig/x86/CONFIG_CHROMEOS_PSTORE1
-rw-r--r--baseconfig/x86/CONFIG_CMDLINE_BOOL1
-rw-r--r--baseconfig/x86/CONFIG_COMPAL_LAPTOP1
-rw-r--r--baseconfig/x86/CONFIG_COMPAT_VDSO1
-rw-r--r--baseconfig/x86/CONFIG_CONFIG_PINCTRL_LEWISBURG1
-rw-r--r--baseconfig/x86/CONFIG_CPA_DEBUG1
-rw-r--r--baseconfig/x86/CONFIG_CRC_PMIC_OPREGION1
-rw-r--r--baseconfig/x86/CONFIG_CRYPTO_AES_NI_INTEL1
-rw-r--r--baseconfig/x86/CONFIG_CRYPTO_CRC32C_INTEL1
-rw-r--r--baseconfig/x86/CONFIG_CRYPTO_CRC32_PCLMUL1
-rw-r--r--baseconfig/x86/CONFIG_CRYPTO_DEV_CCP1
-rw-r--r--baseconfig/x86/CONFIG_CRYPTO_DEV_CCP_CRYPTO1
-rw-r--r--baseconfig/x86/CONFIG_CRYPTO_DEV_CCP_DD1
-rw-r--r--baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK1
-rw-r--r--baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK_AES1
-rw-r--r--baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK_SHA1
-rw-r--r--baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C3XXX1
-rw-r--r--baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C3XXXVF1
-rw-r--r--baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C62X1
-rw-r--r--baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C62XVF1
-rw-r--r--baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_DH895xCC1
-rw-r--r--baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_DH895xCCVF1
-rw-r--r--baseconfig/x86/CONFIG_CRYPTO_SERPENT_SSE2_5861
-rw-r--r--baseconfig/x86/CONFIG_DCDBAS1
-rw-r--r--baseconfig/x86/CONFIG_DEBUG_ENTRY1
-rw-r--r--baseconfig/x86/CONFIG_DEBUG_NMI_SELFTEST1
-rw-r--r--baseconfig/x86/CONFIG_DEBUG_PER_CPU_MAPS1
-rw-r--r--baseconfig/x86/CONFIG_DEBUG_STACKOVERFLOW1
-rw-r--r--baseconfig/x86/CONFIG_DEBUG_TLBFLUSH1
-rw-r--r--baseconfig/x86/CONFIG_DEBUG_WX1
-rw-r--r--baseconfig/x86/CONFIG_DELL_LAPTOP1
-rw-r--r--baseconfig/x86/CONFIG_DELL_RBTN1
-rw-r--r--baseconfig/x86/CONFIG_DELL_RBU1
-rw-r--r--baseconfig/x86/CONFIG_DELL_SMBIOS1
-rw-r--r--baseconfig/x86/CONFIG_DELL_SMO88001
-rw-r--r--baseconfig/x86/CONFIG_DELL_WMI1
-rw-r--r--baseconfig/x86/CONFIG_DELL_WMI_AIO1
-rw-r--r--baseconfig/x86/CONFIG_DELL_WMI_LED1
-rw-r--r--baseconfig/x86/CONFIG_DMIID1
-rw-r--r--baseconfig/x86/CONFIG_DMI_SYSFS1
-rw-r--r--baseconfig/x86/CONFIG_DPTF_POWER1
-rw-r--r--baseconfig/x86/CONFIG_DRM_GMA36001
-rw-r--r--baseconfig/x86/CONFIG_DRM_GMA5001
-rw-r--r--baseconfig/x86/CONFIG_DRM_GMA6001
-rw-r--r--baseconfig/x86/CONFIG_DRM_I8101
-rw-r--r--baseconfig/x86/CONFIG_DRM_I9151
-rw-r--r--baseconfig/x86/CONFIG_DRM_I915_ALPHA_SUPPORT1
-rw-r--r--baseconfig/x86/CONFIG_DRM_I915_CAPTURE_ERROR1
-rw-r--r--baseconfig/x86/CONFIG_DRM_I915_COMPRESS_ERROR1
-rw-r--r--baseconfig/x86/CONFIG_DRM_I915_DEBUG_VBLANK_EVADE1
-rw-r--r--baseconfig/x86/CONFIG_DRM_I915_GVT1
-rw-r--r--baseconfig/x86/CONFIG_DRM_I915_GVT_KVMGT1
-rw-r--r--baseconfig/x86/CONFIG_DRM_I915_USERPTR1
-rw-r--r--baseconfig/x86/CONFIG_DRM_PANEL1
-rw-r--r--baseconfig/x86/CONFIG_DRM_PANEL_LVDS1
-rw-r--r--baseconfig/x86/CONFIG_DRM_VBOXVIDEO1
-rw-r--r--baseconfig/x86/CONFIG_DRM_VMWGFX1
-rw-r--r--baseconfig/x86/CONFIG_DRM_VMWGFX_FBCON1
-rw-r--r--baseconfig/x86/CONFIG_DW_DMAC_CORE1
-rw-r--r--baseconfig/x86/CONFIG_DW_DMAC_PCI1
-rw-r--r--baseconfig/x86/CONFIG_E1000E_HWTS1
-rw-r--r--baseconfig/x86/CONFIG_EADC_AMD641
-rw-r--r--baseconfig/x86/CONFIG_EARLY_PRINTK_EFI1
-rw-r--r--baseconfig/x86/CONFIG_EDAC_AMD81111
-rw-r--r--baseconfig/x86/CONFIG_EDAC_AMD81311
-rw-r--r--baseconfig/x86/CONFIG_EDAC_DECODE_MCE1
-rw-r--r--baseconfig/x86/CONFIG_EDAC_E752X1
-rw-r--r--baseconfig/x86/CONFIG_EDAC_I30001
-rw-r--r--baseconfig/x86/CONFIG_EDAC_I32001
-rw-r--r--baseconfig/x86/CONFIG_EDAC_I50001
-rw-r--r--baseconfig/x86/CONFIG_EDAC_I51001
-rw-r--r--baseconfig/x86/CONFIG_EDAC_I54001
-rw-r--r--baseconfig/x86/CONFIG_EDAC_I73001
-rw-r--r--baseconfig/x86/CONFIG_EDAC_I7CORE1
-rw-r--r--baseconfig/x86/CONFIG_EDAC_I82975X1
-rw-r--r--baseconfig/x86/CONFIG_EDAC_IE312001
-rw-r--r--baseconfig/x86/CONFIG_EDAC_X381
-rw-r--r--baseconfig/x86/CONFIG_EDD1
-rw-r--r--baseconfig/x86/CONFIG_EDD_OFF1
-rw-r--r--baseconfig/x86/CONFIG_EEEPC_LAPTOP1
-rw-r--r--baseconfig/x86/CONFIG_EEEPC_WMI1
-rw-r--r--baseconfig/x86/CONFIG_EFI1
-rw-r--r--baseconfig/x86/CONFIG_EFIVAR_FS1
-rw-r--r--baseconfig/x86/CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT1
-rw-r--r--baseconfig/x86/CONFIG_EFI_BOOTLOADER_CONTROL1
-rw-r--r--baseconfig/x86/CONFIG_EFI_CAPSULE_LOADER1
-rw-r--r--baseconfig/x86/CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH1
-rw-r--r--baseconfig/x86/CONFIG_EFI_FAKE_MEMMAP1
-rw-r--r--baseconfig/x86/CONFIG_EFI_PCDP1
-rw-r--r--baseconfig/x86/CONFIG_EFI_RUNTIME_MAP1
-rw-r--r--baseconfig/x86/CONFIG_EFI_SECURE_BOOT_LOCK_DOWN1
-rw-r--r--baseconfig/x86/CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE1
-rw-r--r--baseconfig/x86/CONFIG_EFI_SIGNATURE_LIST_PARSER1
-rw-r--r--baseconfig/x86/CONFIG_EFI_STUB1
-rw-r--r--baseconfig/x86/CONFIG_EFI_VARS1
-rw-r--r--baseconfig/x86/CONFIG_EFI_VARS_PSTORE1
-rw-r--r--baseconfig/x86/CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE1
-rw-r--r--baseconfig/x86/CONFIG_ENA_ETHERNET1
-rw-r--r--baseconfig/x86/CONFIG_EXTCON1
-rw-r--r--baseconfig/x86/CONFIG_EXTCON_GPIO1
-rw-r--r--baseconfig/x86/CONFIG_EXTCON_INTEL_INT34961
-rw-r--r--baseconfig/x86/CONFIG_EXTCON_MAX33551
-rw-r--r--baseconfig/x86/CONFIG_EXTCON_RT8973A1
-rw-r--r--baseconfig/x86/CONFIG_EXTCON_SM55021
-rw-r--r--baseconfig/x86/CONFIG_EXTCON_USB_GPIO1
-rw-r--r--baseconfig/x86/CONFIG_F71808E_WDT1
-rw-r--r--baseconfig/x86/CONFIG_FB_ARC1
-rw-r--r--baseconfig/x86/CONFIG_FB_EFI1
-rw-r--r--baseconfig/x86/CONFIG_FB_GEODE1
-rw-r--r--baseconfig/x86/CONFIG_FB_HGA1
-rw-r--r--baseconfig/x86/CONFIG_FB_HYPERV1
-rw-r--r--baseconfig/x86/CONFIG_FB_I8101
-rw-r--r--baseconfig/x86/CONFIG_FB_I810_GTF1
-rw-r--r--baseconfig/x86/CONFIG_FB_I810_I2C1
-rw-r--r--baseconfig/x86/CONFIG_FB_LE805781
-rw-r--r--baseconfig/x86/CONFIG_FB_N4111
-rw-r--r--baseconfig/x86/CONFIG_FB_VGA161
-rw-r--r--baseconfig/x86/CONFIG_FB_VIA1
-rw-r--r--baseconfig/x86/CONFIG_FB_VIA_DIRECT_PROCFS1
-rw-r--r--baseconfig/x86/CONFIG_FUJITSU_ES1
-rw-r--r--baseconfig/x86/CONFIG_FUJITSU_LAPTOP1
-rw-r--r--baseconfig/x86/CONFIG_FUJITSU_LAPTOP_DEBUG1
-rw-r--r--baseconfig/x86/CONFIG_FUJITSU_TABLET1
-rw-r--r--baseconfig/x86/CONFIG_GENERIC_ISA_DMA1
-rw-r--r--baseconfig/x86/CONFIG_GPIO_104_IDI_481
-rw-r--r--baseconfig/x86/CONFIG_GPIO_AMD81111
-rw-r--r--baseconfig/x86/CONFIG_GPIO_CRYSTAL_COVE1
-rw-r--r--baseconfig/x86/CONFIG_GPIO_CS55351
-rw-r--r--baseconfig/x86/CONFIG_GPIO_F7188X1
-rw-r--r--baseconfig/x86/CONFIG_GPIO_ICH1
-rw-r--r--baseconfig/x86/CONFIG_GPIO_INTEL_MID1
-rw-r--r--baseconfig/x86/CONFIG_GPIO_IT871
-rw-r--r--baseconfig/x86/CONFIG_GPIO_LYNXPOINT1
-rw-r--r--baseconfig/x86/CONFIG_GPIO_ML_IOH1
-rw-r--r--baseconfig/x86/CONFIG_GPIO_SCH1
-rw-r--r--baseconfig/x86/CONFIG_GPIO_VX8551
-rw-r--r--baseconfig/x86/CONFIG_GPIO_WHISKEY_COVE1
-rw-r--r--baseconfig/x86/CONFIG_HARDLOCKUP_DETECTOR1
-rw-r--r--baseconfig/x86/CONFIG_HDMI_LPE_AUDIO1
-rw-r--r--baseconfig/x86/CONFIG_HID_ASUS1
-rw-r--r--baseconfig/x86/CONFIG_HID_HYPERV_MOUSE1
-rw-r--r--baseconfig/x86/CONFIG_HOTPLUG_PCI_COMPAQ1
-rw-r--r--baseconfig/x86/CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM1
-rw-r--r--baseconfig/x86/CONFIG_HOTPLUG_PCI_IBM1
-rw-r--r--baseconfig/x86/CONFIG_HPET1
-rw-r--r--baseconfig/x86/CONFIG_HPET_MMAP1
-rw-r--r--baseconfig/x86/CONFIG_HPET_TIMER1
-rw-r--r--baseconfig/x86/CONFIG_HPWDT_NMI_DECODING1
-rw-r--r--baseconfig/x86/CONFIG_HP_ACCEL1
-rw-r--r--baseconfig/x86/CONFIG_HP_ILO1
-rw-r--r--baseconfig/x86/CONFIG_HP_WATCHDOG1
-rw-r--r--baseconfig/x86/CONFIG_HP_WIRELESS1
-rw-r--r--baseconfig/x86/CONFIG_HP_WMI1
-rw-r--r--baseconfig/x86/CONFIG_HVC_XEN1
-rw-r--r--baseconfig/x86/CONFIG_HVC_XEN_FRONTEND1
-rw-r--r--baseconfig/x86/CONFIG_HW_RANDOM_AMD1
-rw-r--r--baseconfig/x86/CONFIG_HW_RANDOM_INTEL1
-rw-r--r--baseconfig/x86/CONFIG_HW_RANDOM_VIA1
-rw-r--r--baseconfig/x86/CONFIG_HYPERV1
-rw-r--r--baseconfig/x86/CONFIG_HYPERVISOR_GUEST1
-rw-r--r--baseconfig/x86/CONFIG_HYPERV_BALLOON1
-rw-r--r--baseconfig/x86/CONFIG_HYPERV_KEYBOARD1
-rw-r--r--baseconfig/x86/CONFIG_HYPERV_NET1
-rw-r--r--baseconfig/x86/CONFIG_HYPERV_STORAGE1
-rw-r--r--baseconfig/x86/CONFIG_HYPERV_UTILS1
-rw-r--r--baseconfig/x86/CONFIG_HYPERV_VSOCKETS1
-rw-r--r--baseconfig/x86/CONFIG_I2C1
-rw-r--r--baseconfig/x86/CONFIG_I2C_AMD7561
-rw-r--r--baseconfig/x86/CONFIG_I2C_AMD756_S48821
-rw-r--r--baseconfig/x86/CONFIG_I2C_AMD81111
-rw-r--r--baseconfig/x86/CONFIG_I2C_DESIGNWARE_BAYTRAIL1
-rw-r--r--baseconfig/x86/CONFIG_I2C_DESIGNWARE_CORE1
-rw-r--r--baseconfig/x86/CONFIG_I2C_DESIGNWARE_PLATFORM1
-rw-r--r--baseconfig/x86/CONFIG_I2C_I8011
-rw-r--r--baseconfig/x86/CONFIG_I2C_ISCH1
-rw-r--r--baseconfig/x86/CONFIG_I2C_ISMT1
-rw-r--r--baseconfig/x86/CONFIG_I2C_NFORCE21
-rw-r--r--baseconfig/x86/CONFIG_I2C_NFORCE2_S49851
-rw-r--r--baseconfig/x86/CONFIG_I2C_PARPORT1
-rw-r--r--baseconfig/x86/CONFIG_I2C_PARPORT_LIGHT1
-rw-r--r--baseconfig/x86/CONFIG_I2C_PIIX41
-rw-r--r--baseconfig/x86/CONFIG_I2C_PXA1
-rw-r--r--baseconfig/x86/CONFIG_I2C_PXA_SLAVE1
-rw-r--r--baseconfig/x86/CONFIG_I2C_SCMI1
-rw-r--r--baseconfig/x86/CONFIG_I2C_SIS96X1
-rw-r--r--baseconfig/x86/CONFIG_I2C_VIA1
-rw-r--r--baseconfig/x86/CONFIG_I2C_VIAPRO1
-rw-r--r--baseconfig/x86/CONFIG_I8K1
-rw-r--r--baseconfig/x86/CONFIG_IB700_WDT1
-rw-r--r--baseconfig/x86/CONFIG_IBMASR1
-rw-r--r--baseconfig/x86/CONFIG_IBM_ASM1
-rw-r--r--baseconfig/x86/CONFIG_IBM_RTL1
-rw-r--r--baseconfig/x86/CONFIG_IDEAPAD_LAPTOP1
-rw-r--r--baseconfig/x86/CONFIG_IDMA641
-rw-r--r--baseconfig/x86/CONFIG_IE6XX_WDT1
-rw-r--r--baseconfig/x86/CONFIG_INFINIBAND_VMWARE_PVRDMA1
-rw-r--r--baseconfig/x86/CONFIG_INPUT_SOC_BUTTON_ARRAY1
-rw-r--r--baseconfig/x86/CONFIG_INPUT_XEN_KBDDEV_FRONTEND1
-rw-r--r--baseconfig/x86/CONFIG_INT3406_THERMAL1
-rw-r--r--baseconfig/x86/CONFIG_INT340X_THERMAL1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_ATOMISP1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_BXT_PMIC_THERMAL1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_CHT_INT33FE1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_HID_EVENT1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_IDLE1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_IDMA641
-rw-r--r--baseconfig/x86/CONFIG_INTEL_INT0002_VGPIO1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_IOATDMA1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_IOMMU1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_IOMMU_DEFAULT_ON1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_IOMMU_FLOPPY_WA1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_IOMMU_SVM1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_IPS1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_MEI1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_MEI_ME1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_MEI_TXE1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_MEI_WDT1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_MENLOW1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_OAKTRAIL1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_PCH_THERMAL1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_PMC_CORE1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_PMC_IPC1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_POWERCLAMP1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_PUNIT_IPC1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_RAPL1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_RDT1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_RDT_A1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_RST1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_SCU_IPC1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_SMARTCONNECT1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_SOC_DTS_THERMAL1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_SOC_PMIC1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_SOC_PMIC_CHTWC1
-rw-r--r--baseconfig/x86/CONFIG_INTEL_VBTN1
-rw-r--r--baseconfig/x86/CONFIG_IOMMU_STRESS1
-rw-r--r--baseconfig/x86/CONFIG_IOSF_MBI1
-rw-r--r--baseconfig/x86/CONFIG_IOSF_MBI_DEBUG1
-rw-r--r--baseconfig/x86/CONFIG_IPW21001
-rw-r--r--baseconfig/x86/CONFIG_IPW2100_MONITOR1
-rw-r--r--baseconfig/x86/CONFIG_IPW22001
-rw-r--r--baseconfig/x86/CONFIG_IPW2200_MONITOR1
-rw-r--r--baseconfig/x86/CONFIG_IPW2200_PROMISCUOUS1
-rw-r--r--baseconfig/x86/CONFIG_IPW2200_QOS1
-rw-r--r--baseconfig/x86/CONFIG_IPW2200_RADIOTAP1
-rw-r--r--baseconfig/x86/CONFIG_IRQ_DOMAIN_DEBUG1
-rw-r--r--baseconfig/x86/CONFIG_ISCSI_IBFT1
-rw-r--r--baseconfig/x86/CONFIG_ISCSI_IBFT_FIND1
-rw-r--r--baseconfig/x86/CONFIG_KEXEC_VERIFY_SIG1
-rw-r--r--baseconfig/x86/CONFIG_KEYBOARD_GPIO1
-rw-r--r--baseconfig/x86/CONFIG_KVM1
-rw-r--r--baseconfig/x86/CONFIG_KVM_AMD1
-rw-r--r--baseconfig/x86/CONFIG_KVM_DEBUG_FS1
-rw-r--r--baseconfig/x86/CONFIG_KVM_DEVICE_ASSIGNMENT1
-rw-r--r--baseconfig/x86/CONFIG_KVM_GUEST1
-rw-r--r--baseconfig/x86/CONFIG_KVM_INTEL1
-rw-r--r--baseconfig/x86/CONFIG_KVM_MMU_AUDIT1
-rw-r--r--baseconfig/x86/CONFIG_LEDS_INTEL_SS42001
-rw-r--r--baseconfig/x86/CONFIG_LGUEST1
-rw-r--r--baseconfig/x86/CONFIG_LGUEST_GUEST1
-rw-r--r--baseconfig/x86/CONFIG_LOAD_UEFI_KEYS1
-rw-r--r--baseconfig/x86/CONFIG_LOCK_DOWN_KERNEL1
-rw-r--r--baseconfig/x86/CONFIG_LPC_ICH1
-rw-r--r--baseconfig/x86/CONFIG_LPC_SCH1
-rw-r--r--baseconfig/x86/CONFIG_MACINTOSH_DRIVERS1
-rw-r--r--baseconfig/x86/CONFIG_MAXSMP1
-rw-r--r--baseconfig/x86/CONFIG_MEMTEST1
-rw-r--r--baseconfig/x86/CONFIG_MFD_88PM8001
-rw-r--r--baseconfig/x86/CONFIG_MFD_88PM8051
-rw-r--r--baseconfig/x86/CONFIG_MFD_AAT2870_CORE1
-rw-r--r--baseconfig/x86/CONFIG_MFD_AS37111
-rw-r--r--baseconfig/x86/CONFIG_MFD_DA9052_I2C1
-rw-r--r--baseconfig/x86/CONFIG_MFD_DA90551
-rw-r--r--baseconfig/x86/CONFIG_MFD_INTEL_LPSS_ACPI1
-rw-r--r--baseconfig/x86/CONFIG_MFD_INTEL_LPSS_PCI1
-rw-r--r--baseconfig/x86/CONFIG_MFD_INTEL_QUARK_I2C_GPIO1
-rw-r--r--baseconfig/x86/CONFIG_MFD_LP87881
-rw-r--r--baseconfig/x86/CONFIG_MFD_RC5T5831
-rw-r--r--baseconfig/x86/CONFIG_MFD_SEC_CORE1
-rw-r--r--baseconfig/x86/CONFIG_MFD_SMSC1
-rw-r--r--baseconfig/x86/CONFIG_MFD_TPS6586X1
-rw-r--r--baseconfig/x86/CONFIG_MICROCODE1
-rw-r--r--baseconfig/x86/CONFIG_MICROCODE_AMD1
-rw-r--r--baseconfig/x86/CONFIG_MICROCODE_INTEL1
-rw-r--r--baseconfig/x86/CONFIG_MMC_TOSHIBA_PCI1
-rw-r--r--baseconfig/x86/CONFIG_MMIOTRACE1
-rw-r--r--baseconfig/x86/CONFIG_MMIOTRACE_TEST1
-rw-r--r--baseconfig/x86/CONFIG_MOUSE_PS2_VMMOUSE1
-rw-r--r--baseconfig/x86/CONFIG_MPILIB1
-rw-r--r--baseconfig/x86/CONFIG_MSI_LAPTOP1
-rw-r--r--baseconfig/x86/CONFIG_MSI_WMI1
-rw-r--r--baseconfig/x86/CONFIG_MTD_CK804XROM1
-rw-r--r--baseconfig/x86/CONFIG_MTD_ESB2ROM1
-rw-r--r--baseconfig/x86/CONFIG_MTRR1
-rw-r--r--baseconfig/x86/CONFIG_MTRR_SANITIZER1
-rw-r--r--baseconfig/x86/CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT1
-rw-r--r--baseconfig/x86/CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT1
-rw-r--r--baseconfig/x86/CONFIG_NET_SB10001
-rw-r--r--baseconfig/x86/CONFIG_NET_VENDOR_SOLARFLARE1
-rw-r--r--baseconfig/x86/CONFIG_NFC_MEI_PHY1
-rw-r--r--baseconfig/x86/CONFIG_NFC_MICROREAD_MEI1
-rw-r--r--baseconfig/x86/CONFIG_NFC_PN544_MEI1
-rw-r--r--baseconfig/x86/CONFIG_NIC7018_WDT1
-rw-r--r--baseconfig/x86/CONFIG_NO_BOOTMEM1
-rw-r--r--baseconfig/x86/CONFIG_NVRAM1
-rw-r--r--baseconfig/x86/CONFIG_NV_TCO1
-rw-r--r--baseconfig/x86/CONFIG_PANASONIC_LAPTOP1
-rw-r--r--baseconfig/x86/CONFIG_PARAVIRT1
-rw-r--r--baseconfig/x86/CONFIG_PARAVIRT_DEBUG1
-rw-r--r--baseconfig/x86/CONFIG_PARAVIRT_SPINLOCKS1
-rw-r--r--baseconfig/x86/CONFIG_PARAVIRT_TIME_ACCOUNTING1
-rw-r--r--baseconfig/x86/CONFIG_PARPORT1
-rw-r--r--baseconfig/x86/CONFIG_PARPORT_12841
-rw-r--r--baseconfig/x86/CONFIG_PARPORT_AX887961
-rw-r--r--baseconfig/x86/CONFIG_PARPORT_PC1
-rw-r--r--baseconfig/x86/CONFIG_PARPORT_PC_FIFO1
-rw-r--r--baseconfig/x86/CONFIG_PARPORT_PC_PCMCIA1
-rw-r--r--baseconfig/x86/CONFIG_PARPORT_PC_SUPERIO1
-rw-r--r--baseconfig/x86/CONFIG_PARPORT_SERIAL1
-rw-r--r--baseconfig/x86/CONFIG_PATA_ACPI1
-rw-r--r--baseconfig/x86/CONFIG_PATA_ATIIXP1
-rw-r--r--baseconfig/x86/CONFIG_PATA_MPIIX1
-rw-r--r--baseconfig/x86/CONFIG_PATA_OLDPIIX1
-rw-r--r--baseconfig/x86/CONFIG_PATA_SCH1
-rw-r--r--baseconfig/x86/CONFIG_PATA_TOSHIBA1
-rw-r--r--baseconfig/x86/CONFIG_PATA_TRIFLEX1
-rw-r--r--baseconfig/x86/CONFIG_PCH_CAN1
-rw-r--r--baseconfig/x86/CONFIG_PCH_DMA1
-rw-r--r--baseconfig/x86/CONFIG_PCH_GBE1
-rw-r--r--baseconfig/x86/CONFIG_PCH_PHUB1
-rw-r--r--baseconfig/x86/CONFIG_PCI_BIOS1
-rw-r--r--baseconfig/x86/CONFIG_PCI_CNB20LE_QUIRK1
-rw-r--r--baseconfig/x86/CONFIG_PCI_HYPERV1
-rw-r--r--baseconfig/x86/CONFIG_PCI_MMCONFIG1
-rw-r--r--baseconfig/x86/CONFIG_PEAQ_WMI1
-rw-r--r--baseconfig/x86/CONFIG_PERF_EVENTS_AMD_POWER1
-rw-r--r--baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_CSTATE1
-rw-r--r--baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_RAPL1
-rw-r--r--baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_UNCORE1
-rw-r--r--baseconfig/x86/CONFIG_PINCTRL1
-rw-r--r--baseconfig/x86/CONFIG_PINCTRL_AMD1
-rw-r--r--baseconfig/x86/CONFIG_PINCTRL_BAYTRAIL1
-rw-r--r--baseconfig/x86/CONFIG_PINCTRL_BROXTON1
-rw-r--r--baseconfig/x86/CONFIG_PINCTRL_CHERRYVIEW1
-rw-r--r--baseconfig/x86/CONFIG_PINCTRL_DENVERTON1
-rw-r--r--baseconfig/x86/CONFIG_PINCTRL_GEMINILAKE1
-rw-r--r--baseconfig/x86/CONFIG_PINCTRL_SUNRISEPOINT1
-rw-r--r--baseconfig/x86/CONFIG_PMIC_ADP55201
-rw-r--r--baseconfig/x86/CONFIG_PMIC_DA903X1
-rw-r--r--baseconfig/x86/CONFIG_PMIC_OPREGION1
-rw-r--r--baseconfig/x86/CONFIG_PNP1
-rw-r--r--baseconfig/x86/CONFIG_PNPACPI1
-rw-r--r--baseconfig/x86/CONFIG_PNP_DEBUG_MESSAGES1
-rw-r--r--baseconfig/x86/CONFIG_PPS_CLIENT_PARPORT1
-rw-r--r--baseconfig/x86/CONFIG_PROC_VMCORE1
-rw-r--r--baseconfig/x86/CONFIG_PTP_1588_CLOCK_KVM1
-rw-r--r--baseconfig/x86/CONFIG_PUNIT_ATOM_DEBUG1
-rw-r--r--baseconfig/x86/CONFIG_PVPANIC1
-rw-r--r--baseconfig/x86/CONFIG_PWM_CRC1
-rw-r--r--baseconfig/x86/CONFIG_PWM_LPSS1
-rw-r--r--baseconfig/x86/CONFIG_PWM_LPSS_PCI1
-rw-r--r--baseconfig/x86/CONFIG_PWM_LPSS_PLATFORM1
-rw-r--r--baseconfig/x86/CONFIG_RANDOMIZE_BASE1
-rw-r--r--baseconfig/x86/CONFIG_RAPIDIO1
-rw-r--r--baseconfig/x86/CONFIG_RCU_FANOUT_LEAF1
-rw-r--r--baseconfig/x86/CONFIG_REGMAP_I2C1
-rw-r--r--baseconfig/x86/CONFIG_RELOCATABLE1
-rw-r--r--baseconfig/x86/CONFIG_SAMSUNG_LAPTOP1
-rw-r--r--baseconfig/x86/CONFIG_SAMSUNG_Q101
-rw-r--r--baseconfig/x86/CONFIG_SBC_FITPC2_WATCHDOG1
-rw-r--r--baseconfig/x86/CONFIG_SCHED_MC1
-rw-r--r--baseconfig/x86/CONFIG_SCHED_MC_PRIO1
-rw-r--r--baseconfig/x86/CONFIG_SCHED_SMT1
-rw-r--r--baseconfig/x86/CONFIG_SCSI_ADVANSYS1
-rw-r--r--baseconfig/x86/CONFIG_SENSORS_ABITUGURU1
-rw-r--r--baseconfig/x86/CONFIG_SENSORS_ABITUGURU31
-rw-r--r--baseconfig/x86/CONFIG_SENSORS_ACPI_POWER1
-rw-r--r--baseconfig/x86/CONFIG_SENSORS_APPLESMC=m1
-rw-r--r--baseconfig/x86/CONFIG_SENSORS_ASB1001
-rw-r--r--baseconfig/x86/CONFIG_SENSORS_ATK01101
-rw-r--r--baseconfig/x86/CONFIG_SENSORS_CORETEMP1
-rw-r--r--baseconfig/x86/CONFIG_SENSORS_DELL_SMM1
-rw-r--r--baseconfig/x86/CONFIG_SENSORS_FAM15H_POWER1
-rw-r--r--baseconfig/x86/CONFIG_SENSORS_FSCHMD1
-rw-r--r--baseconfig/x86/CONFIG_SENSORS_HDAPS1
-rw-r--r--baseconfig/x86/CONFIG_SENSORS_I55001
-rw-r--r--baseconfig/x86/CONFIG_SENSORS_I5K_AMB1
-rw-r--r--baseconfig/x86/CONFIG_SENSORS_K10TEMP1
-rw-r--r--baseconfig/x86/CONFIG_SENSORS_K8TEMP1
-rw-r--r--baseconfig/x86/CONFIG_SENSORS_VIA_CPUTEMP1
-rw-r--r--baseconfig/x86/CONFIG_SERIAL_8250_LPSS1
-rw-r--r--baseconfig/x86/CONFIG_SFI1
-rw-r--r--baseconfig/x86/CONFIG_SILEAD_DMI1
-rw-r--r--baseconfig/x86/CONFIG_SMSC37B787_WDT1
-rw-r--r--baseconfig/x86/CONFIG_SND_INTEL8X01
-rw-r--r--baseconfig/x86/CONFIG_SND_INTEL8X0M1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_AC97_CODEC1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_ES83161
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_ES83281
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_ES8328_I2C1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_ES8328_SPI1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_BAYTRAIL1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_BROADWELL_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_BXT_RT298_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_HASWELL_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_RT286_MACH1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_SST1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_INTEL_SST_ACPI1
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_NAU85401
-rw-r--r--baseconfig/x86/CONFIG_SND_SOC_TS3A227E1
-rw-r--r--baseconfig/x86/CONFIG_SND_VIA82XX1
-rw-r--r--baseconfig/x86/CONFIG_SND_VIA82XX_MODEM1
-rw-r--r--baseconfig/x86/CONFIG_SND_X861
-rw-r--r--baseconfig/x86/CONFIG_SONYPI_COMPAT1
-rw-r--r--baseconfig/x86/CONFIG_SONY_LAPTOP1
-rw-r--r--baseconfig/x86/CONFIG_SP5100_TCO1
-rw-r--r--baseconfig/x86/CONFIG_SPI1
-rw-r--r--baseconfig/x86/CONFIG_SPI_CADENCE1
-rw-r--r--baseconfig/x86/CONFIG_SPI_MASTER1
-rw-r--r--baseconfig/x86/CONFIG_SPI_PXA2XX1
-rw-r--r--baseconfig/x86/CONFIG_SPI_ZYNQMP_GQSPI1
-rw-r--r--baseconfig/x86/CONFIG_SURFACE3_WMI1
-rw-r--r--baseconfig/x86/CONFIG_SURFACE_3_BUTTON1
-rw-r--r--baseconfig/x86/CONFIG_SURFACE_PRO3_BUTTON1
-rw-r--r--baseconfig/x86/CONFIG_TCG_INFINEON1
-rw-r--r--baseconfig/x86/CONFIG_THERMAL_GOV_BANG_BANG1
-rw-r--r--baseconfig/x86/CONFIG_THERMAL_GOV_USER_SPACE1
-rw-r--r--baseconfig/x86/CONFIG_THERMAL_WRITABLE_TRIPS1
-rw-r--r--baseconfig/x86/CONFIG_THINKPAD_ACPI1
-rw-r--r--baseconfig/x86/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT1
-rw-r--r--baseconfig/x86/CONFIG_THINKPAD_ACPI_DEBUG1
-rw-r--r--baseconfig/x86/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES1
-rw-r--r--baseconfig/x86/CONFIG_THINKPAD_ACPI_HOTKEY_POLL1
-rw-r--r--baseconfig/x86/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS1
-rw-r--r--baseconfig/x86/CONFIG_THINKPAD_ACPI_VIDEO1
-rw-r--r--baseconfig/x86/CONFIG_TOPSTAR_LAPTOP1
-rw-r--r--baseconfig/x86/CONFIG_TOSHIBA_BT_RFKILL1
-rw-r--r--baseconfig/x86/CONFIG_TOSHIBA_HAPS1
-rw-r--r--baseconfig/x86/CONFIG_TOSHIBA_WMI1
-rw-r--r--baseconfig/x86/CONFIG_TOUCHSCREEN_CY8CTMG1101
-rw-r--r--baseconfig/x86/CONFIG_TOUCHSCREEN_GOODIX1
-rw-r--r--baseconfig/x86/CONFIG_TOUCHSCREEN_INTEL_MID1
-rw-r--r--baseconfig/x86/CONFIG_TOUCHSCREEN_SURFACE3_SPI1
-rw-r--r--baseconfig/x86/CONFIG_UID161
-rw-r--r--baseconfig/x86/CONFIG_USB_SERIAL_MOS7715_PARPORT1
-rw-r--r--baseconfig/x86/CONFIG_VFIO_PCI_VGA1
-rw-r--r--baseconfig/x86/CONFIG_VGA_SWITCHEROO1
-rw-r--r--baseconfig/x86/CONFIG_VIA_WDT1
-rw-r--r--baseconfig/x86/CONFIG_VIDEO_VIA_CAMERA1
-rw-r--r--baseconfig/x86/CONFIG_VMD1
-rw-r--r--baseconfig/x86/CONFIG_VMWARE_BALLOON1
-rw-r--r--baseconfig/x86/CONFIG_VMWARE_PVSCSI1
-rw-r--r--baseconfig/x86/CONFIG_VMWARE_VMCI1
-rw-r--r--baseconfig/x86/CONFIG_VMWARE_VMCI_VSOCKETS1
-rw-r--r--baseconfig/x86/CONFIG_VMXNET31
-rw-r--r--baseconfig/x86/CONFIG_WMI_BMOF1
-rw-r--r--baseconfig/x86/CONFIG_X86_ACPI_CPUFREQ1
-rw-r--r--baseconfig/x86/CONFIG_X86_ACPI_CPUFREQ_CPB1
-rw-r--r--baseconfig/x86/CONFIG_X86_AMD_FREQ_SENSITIVITY1
-rw-r--r--baseconfig/x86/CONFIG_X86_AMD_PLATFORM_DEVICE1
-rw-r--r--baseconfig/x86/CONFIG_X86_CHECK_BIOS_CORRUPTION1
-rw-r--r--baseconfig/x86/CONFIG_X86_CPUID1
-rw-r--r--baseconfig/x86/CONFIG_X86_DEBUG_FPU1
-rw-r--r--baseconfig/x86/CONFIG_X86_DECODER_SELFTEST1
-rw-r--r--baseconfig/x86/CONFIG_X86_EXTENDED_PLATFORM1
-rw-r--r--baseconfig/x86/CONFIG_X86_GENERIC1
-rw-r--r--baseconfig/x86/CONFIG_X86_GOLDFISH1
-rw-r--r--baseconfig/x86/CONFIG_X86_INTEL_LPSS1
-rw-r--r--baseconfig/x86/CONFIG_X86_INTEL_MID1
-rw-r--r--baseconfig/x86/CONFIG_X86_INTEL_MPX1
-rw-r--r--baseconfig/x86/CONFIG_X86_INTEL_PSTATE1
-rw-r--r--baseconfig/x86/CONFIG_X86_LEGACY_VM861
-rw-r--r--baseconfig/x86/CONFIG_X86_MCE1
-rw-r--r--baseconfig/x86/CONFIG_X86_MCE_AMD1
-rw-r--r--baseconfig/x86/CONFIG_X86_MCE_INJECT1
-rw-r--r--baseconfig/x86/CONFIG_X86_MCE_INTEL1
-rw-r--r--baseconfig/x86/CONFIG_X86_MPPARSE1
-rw-r--r--baseconfig/x86/CONFIG_X86_MSR1
-rw-r--r--baseconfig/x86/CONFIG_X86_P4_CLOCKMOD1
-rw-r--r--baseconfig/x86/CONFIG_X86_PAT1
-rw-r--r--baseconfig/x86/CONFIG_X86_PCC_CPUFREQ1
-rw-r--r--baseconfig/x86/CONFIG_X86_PKG_TEMP_THERMAL1
-rw-r--r--baseconfig/x86/CONFIG_X86_PLATFORM_DEVICES1
-rw-r--r--baseconfig/x86/CONFIG_X86_PMEM_LEGACY1
-rw-r--r--baseconfig/x86/CONFIG_X86_PM_TIMER1
-rw-r--r--baseconfig/x86/CONFIG_X86_POWERNOW_K81
-rw-r--r--baseconfig/x86/CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS1
-rw-r--r--baseconfig/x86/CONFIG_X86_RESERVE_LOW1
-rw-r--r--baseconfig/x86/CONFIG_X86_SPEEDSTEP_CENTRINO1
-rw-r--r--baseconfig/x86/CONFIG_X86_SYSFB1
-rw-r--r--baseconfig/x86/CONFIG_X86_VERBOSE_BOOTUP1
-rw-r--r--baseconfig/x86/CONFIG_XEN1
-rw-r--r--baseconfig/x86/CONFIG_XENFS1
-rw-r--r--baseconfig/x86/CONFIG_XEN_ACPI_PROCESSOR1
-rw-r--r--baseconfig/x86/CONFIG_XEN_BACKEND1
-rw-r--r--baseconfig/x86/CONFIG_XEN_BALLOON1
-rw-r--r--baseconfig/x86/CONFIG_XEN_BLKDEV_BACKEND1
-rw-r--r--baseconfig/x86/CONFIG_XEN_BLKDEV_FRONTEND1
-rw-r--r--baseconfig/x86/CONFIG_XEN_COMPAT_XENFS1
-rw-r--r--baseconfig/x86/CONFIG_XEN_DEBUG1
-rw-r--r--baseconfig/x86/CONFIG_XEN_DEBUG_FS1
-rw-r--r--baseconfig/x86/CONFIG_XEN_DOM01
-rw-r--r--baseconfig/x86/CONFIG_XEN_FBDEV_FRONTEND1
-rw-r--r--baseconfig/x86/CONFIG_XEN_GNTDEV1
-rw-r--r--baseconfig/x86/CONFIG_XEN_GRANT_DEV_ALLOC1
-rw-r--r--baseconfig/x86/CONFIG_XEN_NETDEV_BACKEND1
-rw-r--r--baseconfig/x86/CONFIG_XEN_NETDEV_FRONTEND1
-rw-r--r--baseconfig/x86/CONFIG_XEN_PCIDEV_BACKEND1
-rw-r--r--baseconfig/x86/CONFIG_XEN_PCIDEV_FRONTEND1
-rw-r--r--baseconfig/x86/CONFIG_XEN_PV1
-rw-r--r--baseconfig/x86/CONFIG_XEN_PVCALLS_BACKEND1
-rw-r--r--baseconfig/x86/CONFIG_XEN_PVH1
-rw-r--r--baseconfig/x86/CONFIG_XEN_PVHVM1
-rw-r--r--baseconfig/x86/CONFIG_XEN_SAVE_RESTORE1
-rw-r--r--baseconfig/x86/CONFIG_XEN_SCRUB_PAGES1
-rw-r--r--baseconfig/x86/CONFIG_XEN_SCSI_BACKEND1
-rw-r--r--baseconfig/x86/CONFIG_XEN_SCSI_FRONTEND1
-rw-r--r--baseconfig/x86/CONFIG_XEN_SELFBALLOONING1
-rw-r--r--baseconfig/x86/CONFIG_XEN_SYMS1
-rw-r--r--baseconfig/x86/CONFIG_XEN_WDT1
-rw-r--r--baseconfig/x86/CONFIG_XO15_EBOOK1
-rw-r--r--baseconfig/x86/CONFIG_XPOWER_PMIC_OPREGION1
-rw-r--r--baseconfig/x86/CONFIG_XZ_DEC_X861
-rw-r--r--baseconfig/x86/i686/CONFIG_4KSTACKS1
-rw-r--r--baseconfig/x86/i686/CONFIG_64BIT1
-rw-r--r--baseconfig/x86/i686/CONFIG_ALIX1
-rw-r--r--baseconfig/x86/i686/CONFIG_APM1
-rw-r--r--baseconfig/x86/i686/CONFIG_APM_ALLOW_INTS1
-rw-r--r--baseconfig/x86/i686/CONFIG_APM_CPU_IDLE1
-rw-r--r--baseconfig/x86/i686/CONFIG_APM_DISPLAY_BLANK1
-rw-r--r--baseconfig/x86/i686/CONFIG_APM_DO_ENABLE1
-rw-r--r--baseconfig/x86/i686/CONFIG_APM_IGNORE_USER_SUSPEND1
-rw-r--r--baseconfig/x86/i686/CONFIG_BACKLIGHT_OT2001
-rw-r--r--baseconfig/x86/i686/CONFIG_BACKLIGHT_PWM1
-rw-r--r--baseconfig/x86/i686/CONFIG_BATTERY_OLPC1
-rw-r--r--baseconfig/x86/i686/CONFIG_CRYPTO_AES_5861
-rw-r--r--baseconfig/x86/i686/CONFIG_CRYPTO_CRYPTD1
-rw-r--r--baseconfig/x86/i686/CONFIG_CRYPTO_DEV_GEODE1
-rw-r--r--baseconfig/x86/i686/CONFIG_CRYPTO_LRW1
-rw-r--r--baseconfig/x86/i686/CONFIG_CRYPTO_TWOFISH_5861
-rw-r--r--baseconfig/x86/i686/CONFIG_CS5535_CLOCK_EVENT_SRC1
-rw-r--r--baseconfig/x86/i686/CONFIG_CS5535_MFGPT1
-rw-r--r--baseconfig/x86/i686/CONFIG_DW_DMAC_CORE1
-rw-r--r--baseconfig/x86/i686/CONFIG_DW_DMAC_PCI1
-rw-r--r--baseconfig/x86/i686/CONFIG_EDAC_AMD76X1
-rw-r--r--baseconfig/x86/i686/CONFIG_EDAC_E7XXX1
-rw-r--r--baseconfig/x86/i686/CONFIG_EDAC_I828601
-rw-r--r--baseconfig/x86/i686/CONFIG_EDAC_I82875P1
-rw-r--r--baseconfig/x86/i686/CONFIG_EDAC_R826001
-rw-r--r--baseconfig/x86/i686/CONFIG_FB_GEODE1
-rw-r--r--baseconfig/x86/i686/CONFIG_FB_GEODE_GX1
-rw-r--r--baseconfig/x86/i686/CONFIG_FB_GEODE_GX11
-rw-r--r--baseconfig/x86/i686/CONFIG_FB_GEODE_LX1
-rw-r--r--baseconfig/x86/i686/CONFIG_FB_MODE_HELPERS1
-rw-r--r--baseconfig/x86/i686/CONFIG_FB_OLPC_DCON1
-rw-r--r--baseconfig/x86/i686/CONFIG_FB_SSD13071
-rw-r--r--baseconfig/x86/i686/CONFIG_GENERIC_PHY1
-rw-r--r--baseconfig/x86/i686/CONFIG_GEODE_WDT1
-rw-r--r--baseconfig/x86/i686/CONFIG_GEOS1
-rw-r--r--baseconfig/x86/i686/CONFIG_GPIO_74XX_MMIO1
-rw-r--r--baseconfig/x86/i686/CONFIG_GPIO_CS55351
-rw-r--r--baseconfig/x86/i686/CONFIG_GPIO_SCH1
-rw-r--r--baseconfig/x86/i686/CONFIG_GPIO_SODAVILLE1
-rw-r--r--baseconfig/x86/i686/CONFIG_HIGHMEM1
-rw-r--r--baseconfig/x86/i686/CONFIG_HIGHMEM4G1
-rw-r--r--baseconfig/x86/i686/CONFIG_HIGHMEM64G1
-rw-r--r--baseconfig/x86/i686/CONFIG_HIGHPTE1
-rw-r--r--baseconfig/x86/i686/CONFIG_HOTPLUG_PCI_SHPC1
-rw-r--r--baseconfig/x86/i686/CONFIG_HSU_DMA1
-rw-r--r--baseconfig/x86/i686/CONFIG_HW_RANDOM_GEODE1
-rw-r--r--baseconfig/x86/i686/CONFIG_I2C_ALI15351
-rw-r--r--baseconfig/x86/i686/CONFIG_I2C_ALI15631
-rw-r--r--baseconfig/x86/i686/CONFIG_I2C_ALI15X31
-rw-r--r--baseconfig/x86/i686/CONFIG_I2C_MUX1
-rw-r--r--baseconfig/x86/i686/CONFIG_I2C_SIS55951
-rw-r--r--baseconfig/x86/i686/CONFIG_I2C_SIS6301
-rw-r--r--baseconfig/x86/i686/CONFIG_I2O1
-rw-r--r--baseconfig/x86/i686/CONFIG_IB700_WDT1
-rw-r--r--baseconfig/x86/i686/CONFIG_INPUT_GP2A1
-rw-r--r--baseconfig/x86/i686/CONFIG_INPUT_GPIO_TILT_POLLED1
-rw-r--r--baseconfig/x86/i686/CONFIG_INPUT_MATRIXKMAP1
-rw-r--r--baseconfig/x86/i686/CONFIG_INPUT_PWM_BEEPER1
-rw-r--r--baseconfig/x86/i686/CONFIG_INTEL_TXT1
-rw-r--r--baseconfig/x86/i686/CONFIG_KEXEC_JUMP1
-rw-r--r--baseconfig/x86/i686/CONFIG_KEYBOARD_BCM1
-rw-r--r--baseconfig/x86/i686/CONFIG_LBDAF1
-rw-r--r--baseconfig/x86/i686/CONFIG_M4861
-rw-r--r--baseconfig/x86/i686/CONFIG_M5861
-rw-r--r--baseconfig/x86/i686/CONFIG_M586MMX1
-rw-r--r--baseconfig/x86/i686/CONFIG_M586TSC1
-rw-r--r--baseconfig/x86/i686/CONFIG_M6861
-rw-r--r--baseconfig/x86/i686/CONFIG_MATH_EMULATION1
-rw-r--r--baseconfig/x86/i686/CONFIG_MCRUSOE1
-rw-r--r--baseconfig/x86/i686/CONFIG_MCYRIXIII1
-rw-r--r--baseconfig/x86/i686/CONFIG_MDIO_BUS_MUX_GPIO1
-rw-r--r--baseconfig/x86/i686/CONFIG_MDIO_BUS_MUX_MMIOREG1
-rw-r--r--baseconfig/x86/i686/CONFIG_MFD_CS55351
-rw-r--r--baseconfig/x86/i686/CONFIG_MK61
-rw-r--r--baseconfig/x86/i686/CONFIG_MK71
-rw-r--r--baseconfig/x86/i686/CONFIG_MK81
-rw-r--r--baseconfig/x86/i686/CONFIG_MLX5_INFINIBAND1
-rw-r--r--baseconfig/x86/i686/CONFIG_MOUSE_PS2_OLPC1
-rw-r--r--baseconfig/x86/i686/CONFIG_MPENTIUM41
-rw-r--r--baseconfig/x86/i686/CONFIG_MPENTIUMII1
-rw-r--r--baseconfig/x86/i686/CONFIG_MPENTIUMIII1
-rw-r--r--baseconfig/x86/i686/CONFIG_MPENTIUMM1
-rw-r--r--baseconfig/x86/i686/CONFIG_MTD_NAND_CAFE1
-rw-r--r--baseconfig/x86/i686/CONFIG_MTD_OF_PARTS1
-rw-r--r--baseconfig/x86/i686/CONFIG_MTD_PHYSMAP_OF1
-rw-r--r--baseconfig/x86/i686/CONFIG_MVIAC3_21
-rw-r--r--baseconfig/x86/i686/CONFIG_MWINCHIP3D1
-rw-r--r--baseconfig/x86/i686/CONFIG_MWINCHIPC61
-rw-r--r--baseconfig/x86/i686/CONFIG_NET55011
-rw-r--r--baseconfig/x86/i686/CONFIG_NOHIGHMEM1
-rw-r--r--baseconfig/x86/i686/CONFIG_NR_CPUS1
-rw-r--r--baseconfig/x86/i686/CONFIG_NSC_GPIO1
-rw-r--r--baseconfig/x86/i686/CONFIG_NUMA1
-rw-r--r--baseconfig/x86/i686/CONFIG_OF1
-rw-r--r--baseconfig/x86/i686/CONFIG_OF_OVERLAY1
-rw-r--r--baseconfig/x86/i686/CONFIG_OF_UNITTEST1
-rw-r--r--baseconfig/x86/i686/CONFIG_OLPC1
-rw-r--r--baseconfig/x86/i686/CONFIG_OLPC_XO11
-rw-r--r--baseconfig/x86/i686/CONFIG_OLPC_XO15_SCI1
-rw-r--r--baseconfig/x86/i686/CONFIG_OLPC_XO1_PM1
-rw-r--r--baseconfig/x86/i686/CONFIG_OLPC_XO1_RTC1
-rw-r--r--baseconfig/x86/i686/CONFIG_OLPC_XO1_SCI1
-rw-r--r--baseconfig/x86/i686/CONFIG_PC8736x_GPIO1
-rw-r--r--baseconfig/x86/i686/CONFIG_PCI_DIRECT1
-rw-r--r--baseconfig/x86/i686/CONFIG_PCI_GOANY1
-rw-r--r--baseconfig/x86/i686/CONFIG_PCI_GOBIOS1
-rw-r--r--baseconfig/x86/i686/CONFIG_PCI_GODIRECT1
-rw-r--r--baseconfig/x86/i686/CONFIG_PCI_GOMMCONFIG1
-rw-r--r--baseconfig/x86/i686/CONFIG_PHYSICAL_ALIGN1
-rw-r--r--baseconfig/x86/i686/CONFIG_PHYSICAL_START1
-rw-r--r--baseconfig/x86/i686/CONFIG_PINCONF1
-rw-r--r--baseconfig/x86/i686/CONFIG_PINCTRL_SINGLE1
-rw-r--r--baseconfig/x86/i686/CONFIG_PINMUX1
-rw-r--r--baseconfig/x86/i686/CONFIG_POWER_RESET_GPIO1
-rw-r--r--baseconfig/x86/i686/CONFIG_POWER_RESET_GPIO_RESTART1
-rw-r--r--baseconfig/x86/i686/CONFIG_PROVIDE_OHCI1394_DMA_INIT1
-rw-r--r--baseconfig/x86/i686/CONFIG_RCU_FANOUT1
-rw-r--r--baseconfig/x86/i686/CONFIG_REGMAP_I2C1
-rw-r--r--baseconfig/x86/i686/CONFIG_SCx2001
-rw-r--r--baseconfig/x86/i686/CONFIG_SCx200_ACB1
-rw-r--r--baseconfig/x86/i686/CONFIG_SERIAL_8250_MID1
-rw-r--r--baseconfig/x86/i686/CONFIG_SERIAL_GRLIB_GAISLER_APBUART1
-rw-r--r--baseconfig/x86/i686/CONFIG_SERIAL_OF_PLATFORM1
-rw-r--r--baseconfig/x86/i686/CONFIG_SND_SOC_SSM45671
-rw-r--r--baseconfig/x86/i686/CONFIG_SONYPI1
-rw-r--r--baseconfig/x86/i686/CONFIG_SONYPI_COMPAT1
-rw-r--r--baseconfig/x86/i686/CONFIG_SPARSE_IRQ1
-rw-r--r--baseconfig/x86/i686/CONFIG_STA2X111
-rw-r--r--baseconfig/x86/i686/CONFIG_SYNC_FILE1
-rw-r--r--baseconfig/x86/i686/CONFIG_TC1100_WMI1
-rw-r--r--baseconfig/x86/i686/CONFIG_TOSHIBA1
-rw-r--r--baseconfig/x86/i686/CONFIG_TOUCHSCREEN_AUO_PIXCIR1
-rw-r--r--baseconfig/x86/i686/CONFIG_TRANSPARENT_HUGEPAGE1
-rw-r--r--baseconfig/x86/i686/CONFIG_VIDEO_CAFE_CCIC1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_32_IRIS1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_32_NON_STANDARD1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_ANCIENT_MCE1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_BIGSMP1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_CPUFREQ_NFORCE21
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_E_POWERSAVER1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_GENERIC1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_GOLDFISH1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_GX_SUSPMOD1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_INTEL_MID1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_INTEL_QUARK1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_LONGHAUL1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_LONGRUN1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_POWERNOW_K61
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_POWERNOW_K71
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_PPRO_FENCE1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_RDC321X1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_REBOOTFIXUPS1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_ICH1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_LIB1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK1
-rw-r--r--baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_SMI1
-rw-r--r--baseconfig/x86/i686/CONFIG_XO1_RFKILL1
-rw-r--r--baseconfig/x86/i686/CONFIG_ZONE_DMA1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_4KSTACKS1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_64BIT1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_ALIX1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_APM1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_APM_ALLOW_INTS1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_APM_CPU_IDLE1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_APM_DISPLAY_BLANK1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_APM_DO_ENABLE1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_APM_IGNORE_USER_SUSPEND1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_BACKLIGHT_OT2001
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_BACKLIGHT_PWM1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_BATTERY_OLPC1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_CRYPTO_AES_5861
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_CRYPTO_CRYPTD1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_CRYPTO_DEV_GEODE1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_CRYPTO_LRW1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_CRYPTO_TWOFISH_5861
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_CS5535_CLOCK_EVENT_SRC1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_CS5535_MFGPT1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_DW_DMAC_CORE1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_DW_DMAC_PCI1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_EDAC_AMD76X1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_EDAC_E7XXX1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_EDAC_I828601
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_EDAC_I82875P1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_EDAC_R826001
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_FB_GEODE1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_FB_GEODE_GX1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_FB_GEODE_GX11
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_FB_GEODE_LX1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_FB_MODE_HELPERS1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_FB_OLPC_DCON1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_FB_SSD13071
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_GENERIC_PHY1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_GEODE_WDT1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_GEOS1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_GPIO_74XX_MMIO1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_GPIO_SCH1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_GPIO_SODAVILLE1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_HIGHMEM1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_HIGHMEM4G1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_HIGHMEM64G1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_HIGHPTE1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_HOTPLUG_PCI_SHPC1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_HSU_DMA1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_HW_RANDOM_GEODE1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_I2C_ALI15351
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_I2C_ALI15631
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_I2C_ALI15X31
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_I2C_MUX1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_I2C_SIS55951
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_I2C_SIS6301
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_I2O1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_IB700_WDT1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_INPUT_GP2A1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_INPUT_GPIO_TILT_POLLED1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_INPUT_MATRIXKMAP1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_INPUT_PWM_BEEPER1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_INTEL_TXT1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_KEXEC_JUMP1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_KEYBOARD_BCM1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_LBDAF1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_LIBNVDIMM1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_M4861
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_M5861
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_M586MMX1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_M586TSC1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_M6861
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MATH_EMULATION1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MCRUSOE1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MCYRIXIII1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MFD_CS55351
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MK61
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MK71
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MK81
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MLX5_INFINIBAND1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MOUSE_PS2_OLPC1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MPENTIUM41
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MPENTIUMII1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MPENTIUMIII1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MPENTIUMM1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MTD_NAND_CAFE1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MTD_OF_PARTS1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MTD_PHYSMAP_OF1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MVIAC3_21
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MWINCHIP3D1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MWINCHIPC61
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_NET55011
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_NOHIGHMEM1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_NR_CPUS1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_NSC_GPIO1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_NUMA1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_OF1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_OF_OVERLAY1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_OF_UNITTEST1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_OLPC1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_OLPC_XO11
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_OLPC_XO15_SCI1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_PM1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_RTC1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_SCI1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_PC8736x_GPIO1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_PCI_DIRECT1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_PCI_GOANY1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_PCI_GOBIOS1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_PCI_GODIRECT1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_PCI_GOMMCONFIG1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_PHYSICAL_ALIGN1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_PHYSICAL_START1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_PINCONF1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_PINCTRL_SINGLE1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_PINMUX1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_POWER_RESET_GPIO1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_POWER_RESET_GPIO_RESTART1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_PROVIDE_OHCI1394_DMA_INIT1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_RCU_FANOUT1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_REGMAP_I2C1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_SCx2001
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_SCx200_ACB1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_SERIAL_8250_MID1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_SERIAL_GRLIB_GAISLER_APBUART1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_SERIAL_OF_PLATFORM1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_SND_SOC_SSM45671
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_SONYPI1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_SONYPI_COMPAT1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_SPARSE_IRQ1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_STA2X111
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_SYNC_FILE1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_TC1100_WMI1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_TOSHIBA1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_TOUCHSCREEN_AUO_PIXCIR1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_TRANSPARENT_HUGEPAGE1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_VIDEO_CAFE_CCIC1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_32_IRIS1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_32_NON_STANDARD1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_ANCIENT_MCE1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_BIGSMP1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_CPUFREQ_NFORCE21
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_E_POWERSAVER1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_GENERIC1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_GOLDFISH1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_GX_SUSPMOD1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_INTEL_MID1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_INTEL_QUARK1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_LONGHAUL1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_LONGRUN1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_POWERNOW_K61
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_POWERNOW_K71
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_PPRO_FENCE1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_RDC321X1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_REBOOTFIXUPS1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_ICH1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_LIB1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_SMI1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_XEN_DEV_EVTCHN1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_XEN_SYS_HYPERVISOR1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_XO1_RFKILL1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_ZONE_DMA1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_64BIT1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_88EU_AP_MODE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_ACPI_HOTPLUG_MEMORY1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_ACPI_NFIT1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_ACPI_NFIT_DEBUG1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_ACPI_NUMA1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_AK89751
-rw-r--r--baseconfig/x86/x86_64/CONFIG_AMD_IOMMU1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_AMD_IOMMU_V21
-rw-r--r--baseconfig/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_AMD_NUMA1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_AQTION1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_ARCH_MEMORY_PROBE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_AXP20X_ADC1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_AXP20X_POWER1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_AXP288_ADC1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_AXP288_CHARGER1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_AXP288_FUEL_GAUGE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_BATTERY_MAX170421
-rw-r--r--baseconfig/x86/x86_64/CONFIG_BLK_DEV_CMD6401
-rw-r--r--baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS55201
-rw-r--r--baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS55301
-rw-r--r--baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS55351
-rw-r--r--baseconfig/x86/x86_64/CONFIG_BLK_DEV_RZ10001
-rw-r--r--baseconfig/x86/x86_64/CONFIG_BLK_DEV_TRIFLEX1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_BTT1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CALGARY_IOMMU1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CGROUP_HUGETLB1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CHARGER_BQ241901
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CHECKPOINT_RESTORE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CHT_WC_PMIC_OPREGION1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CMA1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CMA_AREAS1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CMA_DEBUG1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CMA_DEBUGFS1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CONTEXT_TRACKING_FORCE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_AES_X86_641
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_BLOWFISH_X86_641
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_641
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_641
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_X86_641
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_CAST5_AVX_X86_641
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_CAST6_AVX_X86_641
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_CHACHA20_X86_641
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_CRCT10DIF_PCLMUL1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_CRYPTD1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_DES3_EDE_X86_641
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_LRW1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_MCRYPTD1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_POLY1305_X86_641
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_SALSA20_X86_641
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_AVX2_X86_641
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_AVX_X86_641
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_SSE2_X86_641
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA1_MB1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA1_SSSE31
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA256_MB1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA256_SSSE31
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA512_MB1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE31
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_SKEIN1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_AVX_X86_641
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_X86_641
-rw-r--r--baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_X86_64_3WAY1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_DEFAULT_MMAP_MIN_ADDR1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_DEFERRED_STRUCT_PAGE_INIT1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_DEVICE_PRIVATE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_DEVICE_PUBLIC1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_DEV_DAX1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_DEV_DAX_PMEM1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_DIRECT_GBPAGES1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_DISCONTIGMEM_MANUAL1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_EDAC_AMD641
-rw-r--r--baseconfig/x86/x86_64/CONFIG_EDAC_AMD64_ERROR_INJECTION1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_EDAC_PND21
-rw-r--r--baseconfig/x86/x86_64/CONFIG_EDAC_SBRIDGE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_EDAC_SKX1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_EFI_MIXED1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_EXTCON_AXP2881
-rw-r--r--baseconfig/x86/x86_64/CONFIG_EXTCON_INTEL_CHT_WC1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_FRAME_WARN1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_FUNCTION_GRAPH_TRACER1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_GART_IOMMU1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_GENERIC_CPU1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_GENERIC_PHY1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_GPIO_AXP2091
-rw-r--r--baseconfig/x86/x86_64/CONFIG_HAVE_MEMORY_PRESENT1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_HFI1_DEBUG_SDMA_ORDER1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_HFI1_VERBS_31BIT_PSN1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_HMM_MIRROR1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_HOTPLUG_PCI_SHPC1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_HSA_AMD1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_HSU_DMA1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_I2C_ALI15351
-rw-r--r--baseconfig/x86/x86_64/CONFIG_I2C_ALI15631
-rw-r--r--baseconfig/x86/x86_64/CONFIG_I2C_ALI15X31
-rw-r--r--baseconfig/x86/x86_64/CONFIG_I2C_CHT_WC1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_PCI1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_I2C_MUX1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_I2C_SIS55951
-rw-r--r--baseconfig/x86/x86_64/CONFIG_I2C_SIS6301
-rw-r--r--baseconfig/x86/x86_64/CONFIG_I7300_IDLE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_IA32_AOUT1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_IA32_EMULATION1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_INFINIBAND_HFI11
-rw-r--r--baseconfig/x86/x86_64/CONFIG_INFINIBAND_OPA_VNIC1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_INPUT_AXP20X_PEK1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_INTEL_INT0002_VGPIO1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_INTEL_ISH_HID1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_INTEL_MIC_BUS1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_INTEL_MIC_CARD1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_INTEL_MIC_HOST1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_INTEL_MIC_X100_DMA1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_INTEL_SCU_IPC1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_INTEL_SOC_PMIC_CHTWC1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_INTEL_TURBO_MAX_31
-rw-r--r--baseconfig/x86/x86_64/CONFIG_INTEL_TXT1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_INV_MPU6050_I2C1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_INV_MPU6050_IIO1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_IOMMU_DEBUG1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_IRQ_REMAP1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_KEXEC_FILE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_KEXEC_JUMP1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_KEXEC_VERIFY_SIG1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_LIBNVDIMM1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_MAILBOX1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_MEMORY_HOTPLUG1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_MEMORY_HOTREMOVE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_MEM_SOFT_DIRTY1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_MFD_AXP20X1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_MFD_AXP20X_I2C1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_MIC_COSM1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_MK81
-rw-r--r--baseconfig/x86/x86_64/CONFIG_MLX_PLATFORM1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_MOVABLE_NODE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_MPSC1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_MTD_BLKDEVS1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_MTD_BLOCK1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_ND_BLK1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_ND_BTT1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_ND_PFN1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NODES_SHIFT1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL_ALL1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL_SYSIDLE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NO_HZ_IDLE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NR_CPUS1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NTB1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NTB_AMD1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NTB_INTEL1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NTB_NETDEV1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NTB_PERF1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NTB_PINGPONG1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NTB_TOOL1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NTB_TRANSPORT1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NUMA1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NUMA_BALANCING1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NUMA_EMU1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NVDIMM_DAX1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_NVDIMM_PFN1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_OF1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_PC8736x_GPIO1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_PHYSICAL_ALIGN1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_PHYSICAL_START1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_PINCONF1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_PINMUX1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_PROVIDE_OHCI1394_DMA_INIT1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_R8188EU1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_RANDOMIZE_MEMORY1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_RCU_FANOUT1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_REGMAP_I2C1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SCIF1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SCIF_BUS1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SDMA_VERBOSITY1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SERIAL_8250_MID1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SFC1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SFC_MCDI_LOGGING1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SFC_MCDI_MON1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SFC_MTD1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SFC_SRIOV1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SGI_GRU1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SGI_GRU_DEBUG1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SGI_IOC41
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SGI_XP1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SILEAD_DMI1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SND_SOC_SSM45671
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SPARSEMEM1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SPARSEMEM_EXTREME1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SPARSEMEM_MANUAL1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SPARSEMEM_VMEMMAP1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SPARSE_IRQ1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SWIOTLB1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_SYNC_FILE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_THUNDERBOLT1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_TRANSPARENT_HUGEPAGE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_USB_XHCI_PLATFORM1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_UV_MMTIMER1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_VIDEO_CAFE_CCIC1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_VMAP_STACK1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_VOP1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_VOP_BUS1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_X86_5LEVEL1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_X86_64_ACPI_NUMA1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_X86_MPPARSE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_X86_NUMACHIP1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_X86_UV1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_X86_VSMP1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_X86_X2APIC1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_X86_X321
-rw-r--r--baseconfig/x86/x86_64/CONFIG_XEN_512GB1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_XEN_BALLOON_MEMORY_HOTPLUG1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_XEN_DEV_EVTCHN1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_XEN_MCE_LOG1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_XEN_STUB1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_XEN_SYS_HYPERVISOR1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_XO15_EBOOK1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_XPOWER_PMIC_OPREGION1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_ZONE_DEVICE1
-rw-r--r--baseconfig/x86/x86_64/CONFIG_ZONE_DMA1
1149 files changed, 0 insertions, 1149 deletions
diff --git a/baseconfig/x86/CONFIG_ACERHDF b/baseconfig/x86/CONFIG_ACERHDF
deleted file mode 100644
index 53c61f3c7..000000000
--- a/baseconfig/x86/CONFIG_ACERHDF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACERHDF=m
diff --git a/baseconfig/x86/CONFIG_ACER_WMI b/baseconfig/x86/CONFIG_ACER_WMI
deleted file mode 100644
index 06ff5c76d..000000000
--- a/baseconfig/x86/CONFIG_ACER_WMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACER_WMI=m
diff --git a/baseconfig/x86/CONFIG_ACPI b/baseconfig/x86/CONFIG_ACPI
deleted file mode 100644
index 839566bae..000000000
--- a/baseconfig/x86/CONFIG_ACPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI=y
diff --git a/baseconfig/x86/CONFIG_ACPI_AC b/baseconfig/x86/CONFIG_ACPI_AC
deleted file mode 100644
index 5dbaee1a8..000000000
--- a/baseconfig/x86/CONFIG_ACPI_AC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_AC=y
diff --git a/baseconfig/x86/CONFIG_ACPI_APEI b/baseconfig/x86/CONFIG_ACPI_APEI
deleted file mode 100644
index 9ab33facf..000000000
--- a/baseconfig/x86/CONFIG_ACPI_APEI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_APEI=y
diff --git a/baseconfig/x86/CONFIG_ACPI_APEI_EINJ b/baseconfig/x86/CONFIG_ACPI_APEI_EINJ
deleted file mode 100644
index 2d03b69a1..000000000
--- a/baseconfig/x86/CONFIG_ACPI_APEI_EINJ
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ACPI_APEI_EINJ is not set
diff --git a/baseconfig/x86/CONFIG_ACPI_APEI_ERST_DEBUG b/baseconfig/x86/CONFIG_ACPI_APEI_ERST_DEBUG
deleted file mode 100644
index 235760d40..000000000
--- a/baseconfig/x86/CONFIG_ACPI_APEI_ERST_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ACPI_APEI_ERST_DEBUG is not set
diff --git a/baseconfig/x86/CONFIG_ACPI_APEI_GHES b/baseconfig/x86/CONFIG_ACPI_APEI_GHES
deleted file mode 100644
index 8fd037d8f..000000000
--- a/baseconfig/x86/CONFIG_ACPI_APEI_GHES
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_APEI_GHES=y
diff --git a/baseconfig/x86/CONFIG_ACPI_APEI_MEMORY_FAILURE b/baseconfig/x86/CONFIG_ACPI_APEI_MEMORY_FAILURE
deleted file mode 100644
index 46aa1579f..000000000
--- a/baseconfig/x86/CONFIG_ACPI_APEI_MEMORY_FAILURE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_APEI_MEMORY_FAILURE=y
diff --git a/baseconfig/x86/CONFIG_ACPI_APEI_PCIEAER b/baseconfig/x86/CONFIG_ACPI_APEI_PCIEAER
deleted file mode 100644
index 26f3e9129..000000000
--- a/baseconfig/x86/CONFIG_ACPI_APEI_PCIEAER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_APEI_PCIEAER=y
diff --git a/baseconfig/x86/CONFIG_ACPI_BATTERY b/baseconfig/x86/CONFIG_ACPI_BATTERY
deleted file mode 100644
index eb3286698..000000000
--- a/baseconfig/x86/CONFIG_ACPI_BATTERY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_BATTERY=y
diff --git a/baseconfig/x86/CONFIG_ACPI_BGRT b/baseconfig/x86/CONFIG_ACPI_BGRT
deleted file mode 100644
index 13035dd82..000000000
--- a/baseconfig/x86/CONFIG_ACPI_BGRT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_BGRT=y
diff --git a/baseconfig/x86/CONFIG_ACPI_BUTTON b/baseconfig/x86/CONFIG_ACPI_BUTTON
deleted file mode 100644
index 1f552016b..000000000
--- a/baseconfig/x86/CONFIG_ACPI_BUTTON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_BUTTON=y
diff --git a/baseconfig/x86/CONFIG_ACPI_CMPC b/baseconfig/x86/CONFIG_ACPI_CMPC
deleted file mode 100644
index 72ad5cede..000000000
--- a/baseconfig/x86/CONFIG_ACPI_CMPC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_CMPC=m
diff --git a/baseconfig/x86/CONFIG_ACPI_CONFIGFS b/baseconfig/x86/CONFIG_ACPI_CONFIGFS
deleted file mode 100644
index fc2af2c0b..000000000
--- a/baseconfig/x86/CONFIG_ACPI_CONFIGFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_CONFIGFS=m
diff --git a/baseconfig/x86/CONFIG_ACPI_CONTAINER b/baseconfig/x86/CONFIG_ACPI_CONTAINER
deleted file mode 100644
index 24287daf8..000000000
--- a/baseconfig/x86/CONFIG_ACPI_CONTAINER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_CONTAINER=y
diff --git a/baseconfig/x86/CONFIG_ACPI_CUSTOM_METHOD b/baseconfig/x86/CONFIG_ACPI_CUSTOM_METHOD
deleted file mode 100644
index 76853b6d8..000000000
--- a/baseconfig/x86/CONFIG_ACPI_CUSTOM_METHOD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_CUSTOM_METHOD=m
diff --git a/baseconfig/x86/CONFIG_ACPI_DOCK b/baseconfig/x86/CONFIG_ACPI_DOCK
deleted file mode 100644
index e4d916353..000000000
--- a/baseconfig/x86/CONFIG_ACPI_DOCK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_DOCK=y
diff --git a/baseconfig/x86/CONFIG_ACPI_EC_DEBUGFS b/baseconfig/x86/CONFIG_ACPI_EC_DEBUGFS
deleted file mode 100644
index dfc6b278f..000000000
--- a/baseconfig/x86/CONFIG_ACPI_EC_DEBUGFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_EC_DEBUGFS=m
diff --git a/baseconfig/x86/CONFIG_ACPI_EXTLOG b/baseconfig/x86/CONFIG_ACPI_EXTLOG
deleted file mode 100644
index 7e48ccedb..000000000
--- a/baseconfig/x86/CONFIG_ACPI_EXTLOG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ACPI_EXTLOG is not set
diff --git a/baseconfig/x86/CONFIG_ACPI_FAN b/baseconfig/x86/CONFIG_ACPI_FAN
deleted file mode 100644
index 0feefba7b..000000000
--- a/baseconfig/x86/CONFIG_ACPI_FAN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_FAN=y
diff --git a/baseconfig/x86/CONFIG_ACPI_HED b/baseconfig/x86/CONFIG_ACPI_HED
deleted file mode 100644
index 06042df5a..000000000
--- a/baseconfig/x86/CONFIG_ACPI_HED
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_HED=y
diff --git a/baseconfig/x86/CONFIG_ACPI_I2C_OPREGION b/baseconfig/x86/CONFIG_ACPI_I2C_OPREGION
deleted file mode 100644
index 92036b975..000000000
--- a/baseconfig/x86/CONFIG_ACPI_I2C_OPREGION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_I2C_OPREGION=y
diff --git a/baseconfig/x86/CONFIG_ACPI_IPMI b/baseconfig/x86/CONFIG_ACPI_IPMI
deleted file mode 100644
index e40fb9aea..000000000
--- a/baseconfig/x86/CONFIG_ACPI_IPMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_IPMI=m
diff --git a/baseconfig/x86/CONFIG_ACPI_PROCESSOR b/baseconfig/x86/CONFIG_ACPI_PROCESSOR
deleted file mode 100644
index a24416dcf..000000000
--- a/baseconfig/x86/CONFIG_ACPI_PROCESSOR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_PROCESSOR=y
diff --git a/baseconfig/x86/CONFIG_ACPI_PROCESSOR_AGGREGATOR b/baseconfig/x86/CONFIG_ACPI_PROCESSOR_AGGREGATOR
deleted file mode 100644
index 67779d489..000000000
--- a/baseconfig/x86/CONFIG_ACPI_PROCESSOR_AGGREGATOR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
diff --git a/baseconfig/x86/CONFIG_ACPI_PROCFS b/baseconfig/x86/CONFIG_ACPI_PROCFS
deleted file mode 100644
index 919c13cf1..000000000
--- a/baseconfig/x86/CONFIG_ACPI_PROCFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_PROCFS=y
diff --git a/baseconfig/x86/CONFIG_ACPI_PROCFS_POWER b/baseconfig/x86/CONFIG_ACPI_PROCFS_POWER
deleted file mode 100644
index 4476fecda..000000000
--- a/baseconfig/x86/CONFIG_ACPI_PROCFS_POWER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ACPI_PROCFS_POWER is not set
diff --git a/baseconfig/x86/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE b/baseconfig/x86/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE
deleted file mode 100644
index 22e6b36cf..000000000
--- a/baseconfig/x86/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set
diff --git a/baseconfig/x86/CONFIG_ACPI_SBS b/baseconfig/x86/CONFIG_ACPI_SBS
deleted file mode 100644
index 82848bd17..000000000
--- a/baseconfig/x86/CONFIG_ACPI_SBS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_SBS=m
diff --git a/baseconfig/x86/CONFIG_ACPI_SLEEP b/baseconfig/x86/CONFIG_ACPI_SLEEP
deleted file mode 100644
index 68612464d..000000000
--- a/baseconfig/x86/CONFIG_ACPI_SLEEP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_SLEEP=y
diff --git a/baseconfig/x86/CONFIG_ACPI_TABLE_UPGRADE b/baseconfig/x86/CONFIG_ACPI_TABLE_UPGRADE
deleted file mode 100644
index 276233fba..000000000
--- a/baseconfig/x86/CONFIG_ACPI_TABLE_UPGRADE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_TABLE_UPGRADE=y
diff --git a/baseconfig/x86/CONFIG_ACPI_THERMAL b/baseconfig/x86/CONFIG_ACPI_THERMAL
deleted file mode 100644
index 1bd7964b4..000000000
--- a/baseconfig/x86/CONFIG_ACPI_THERMAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_THERMAL=y
diff --git a/baseconfig/x86/CONFIG_ACPI_TOSHIBA b/baseconfig/x86/CONFIG_ACPI_TOSHIBA
deleted file mode 100644
index 099107738..000000000
--- a/baseconfig/x86/CONFIG_ACPI_TOSHIBA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_TOSHIBA=m
diff --git a/baseconfig/x86/CONFIG_ACPI_VIDEO b/baseconfig/x86/CONFIG_ACPI_VIDEO
deleted file mode 100644
index b642d06e3..000000000
--- a/baseconfig/x86/CONFIG_ACPI_VIDEO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_VIDEO=m
diff --git a/baseconfig/x86/CONFIG_ACPI_WMI b/baseconfig/x86/CONFIG_ACPI_WMI
deleted file mode 100644
index 9cef4743c..000000000
--- a/baseconfig/x86/CONFIG_ACPI_WMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_WMI=m
diff --git a/baseconfig/x86/CONFIG_AGP b/baseconfig/x86/CONFIG_AGP
deleted file mode 100644
index ea543fee8..000000000
--- a/baseconfig/x86/CONFIG_AGP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AGP=y
diff --git a/baseconfig/x86/CONFIG_AGP_ALI b/baseconfig/x86/CONFIG_AGP_ALI
deleted file mode 100644
index c46aee1e8..000000000
--- a/baseconfig/x86/CONFIG_AGP_ALI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AGP_ALI=y
diff --git a/baseconfig/x86/CONFIG_AGP_AMD b/baseconfig/x86/CONFIG_AGP_AMD
deleted file mode 100644
index 142f8a1cd..000000000
--- a/baseconfig/x86/CONFIG_AGP_AMD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AGP_AMD=y
diff --git a/baseconfig/x86/CONFIG_AGP_AMD64 b/baseconfig/x86/CONFIG_AGP_AMD64
deleted file mode 100644
index 97e9526e4..000000000
--- a/baseconfig/x86/CONFIG_AGP_AMD64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AGP_AMD64=y
diff --git a/baseconfig/x86/CONFIG_AGP_ATI b/baseconfig/x86/CONFIG_AGP_ATI
deleted file mode 100644
index 1f551caec..000000000
--- a/baseconfig/x86/CONFIG_AGP_ATI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AGP_ATI=y
diff --git a/baseconfig/x86/CONFIG_AGP_EFFICEON b/baseconfig/x86/CONFIG_AGP_EFFICEON
deleted file mode 100644
index 070b4ae60..000000000
--- a/baseconfig/x86/CONFIG_AGP_EFFICEON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AGP_EFFICEON=y
diff --git a/baseconfig/x86/CONFIG_AGP_INTEL b/baseconfig/x86/CONFIG_AGP_INTEL
deleted file mode 100644
index 524a67977..000000000
--- a/baseconfig/x86/CONFIG_AGP_INTEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AGP_INTEL=y
diff --git a/baseconfig/x86/CONFIG_AGP_NVIDIA b/baseconfig/x86/CONFIG_AGP_NVIDIA
deleted file mode 100644
index f177c1d92..000000000
--- a/baseconfig/x86/CONFIG_AGP_NVIDIA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AGP_NVIDIA=y
diff --git a/baseconfig/x86/CONFIG_AGP_SIS b/baseconfig/x86/CONFIG_AGP_SIS
deleted file mode 100644
index dac4635e3..000000000
--- a/baseconfig/x86/CONFIG_AGP_SIS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AGP_SIS=y
diff --git a/baseconfig/x86/CONFIG_AGP_SWORKS b/baseconfig/x86/CONFIG_AGP_SWORKS
deleted file mode 100644
index 09d99f431..000000000
--- a/baseconfig/x86/CONFIG_AGP_SWORKS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AGP_SWORKS=y
diff --git a/baseconfig/x86/CONFIG_AGP_VIA b/baseconfig/x86/CONFIG_AGP_VIA
deleted file mode 100644
index 21da1a429..000000000
--- a/baseconfig/x86/CONFIG_AGP_VIA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AGP_VIA=y
diff --git a/baseconfig/x86/CONFIG_ALIENWARE_WMI b/baseconfig/x86/CONFIG_ALIENWARE_WMI
deleted file mode 100644
index b09f63eb8..000000000
--- a/baseconfig/x86/CONFIG_ALIENWARE_WMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ALIENWARE_WMI=m
diff --git a/baseconfig/x86/CONFIG_AMD_XGBE b/baseconfig/x86/CONFIG_AMD_XGBE
deleted file mode 100644
index 27be1a7ee..000000000
--- a/baseconfig/x86/CONFIG_AMD_XGBE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AMD_XGBE=m
diff --git a/baseconfig/x86/CONFIG_AMD_XGBE_DCB b/baseconfig/x86/CONFIG_AMD_XGBE_DCB
deleted file mode 100644
index f3cdcca89..000000000
--- a/baseconfig/x86/CONFIG_AMD_XGBE_DCB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AMD_XGBE_DCB=y
diff --git a/baseconfig/x86/CONFIG_AMILO_RFKILL b/baseconfig/x86/CONFIG_AMILO_RFKILL
deleted file mode 100644
index ab49a1190..000000000
--- a/baseconfig/x86/CONFIG_AMILO_RFKILL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AMILO_RFKILL=m
diff --git a/baseconfig/x86/CONFIG_APPLE_GMUX b/baseconfig/x86/CONFIG_APPLE_GMUX
deleted file mode 100644
index 9ecb754be..000000000
--- a/baseconfig/x86/CONFIG_APPLE_GMUX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_APPLE_GMUX=m
diff --git a/baseconfig/x86/CONFIG_APPLE_PROPERTIES b/baseconfig/x86/CONFIG_APPLE_PROPERTIES
deleted file mode 100644
index 536ecf6bf..000000000
--- a/baseconfig/x86/CONFIG_APPLE_PROPERTIES
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_APPLE_PROPERTIES=y
diff --git a/baseconfig/x86/CONFIG_ASUS_LAPTOP b/baseconfig/x86/CONFIG_ASUS_LAPTOP
deleted file mode 100644
index 40e261455..000000000
--- a/baseconfig/x86/CONFIG_ASUS_LAPTOP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ASUS_LAPTOP=m
diff --git a/baseconfig/x86/CONFIG_ASUS_NB_WMI b/baseconfig/x86/CONFIG_ASUS_NB_WMI
deleted file mode 100644
index 16d2c7fa9..000000000
--- a/baseconfig/x86/CONFIG_ASUS_NB_WMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ASUS_NB_WMI=m
diff --git a/baseconfig/x86/CONFIG_ASUS_WIRELESS b/baseconfig/x86/CONFIG_ASUS_WIRELESS
deleted file mode 100644
index 23c48a9e8..000000000
--- a/baseconfig/x86/CONFIG_ASUS_WIRELESS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ASUS_WIRELESS=m
diff --git a/baseconfig/x86/CONFIG_ASUS_WMI b/baseconfig/x86/CONFIG_ASUS_WMI
deleted file mode 100644
index e881859cc..000000000
--- a/baseconfig/x86/CONFIG_ASUS_WMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ASUS_WMI=m
diff --git a/baseconfig/x86/CONFIG_ATA_ACPI b/baseconfig/x86/CONFIG_ATA_ACPI
deleted file mode 100644
index a0be76e56..000000000
--- a/baseconfig/x86/CONFIG_ATA_ACPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ATA_ACPI=y
diff --git a/baseconfig/x86/CONFIG_BACKLIGHT_APPLE b/baseconfig/x86/CONFIG_BACKLIGHT_APPLE
deleted file mode 100644
index 5150ad41e..000000000
--- a/baseconfig/x86/CONFIG_BACKLIGHT_APPLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BACKLIGHT_APPLE=m
diff --git a/baseconfig/x86/CONFIG_BLK_DEV_AMD74XX b/baseconfig/x86/CONFIG_BLK_DEV_AMD74XX
deleted file mode 100644
index d302ddeb4..000000000
--- a/baseconfig/x86/CONFIG_BLK_DEV_AMD74XX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BLK_DEV_AMD74XX=y
diff --git a/baseconfig/x86/CONFIG_BLK_DEV_PCIESSD_MTIP32XX b/baseconfig/x86/CONFIG_BLK_DEV_PCIESSD_MTIP32XX
deleted file mode 100644
index 4efb94f64..000000000
--- a/baseconfig/x86/CONFIG_BLK_DEV_PCIESSD_MTIP32XX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
diff --git a/baseconfig/x86/CONFIG_BXT_WC_PMIC_OPREGION b/baseconfig/x86/CONFIG_BXT_WC_PMIC_OPREGION
deleted file mode 100644
index d61af920f..000000000
--- a/baseconfig/x86/CONFIG_BXT_WC_PMIC_OPREGION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BXT_WC_PMIC_OPREGION=y
diff --git a/baseconfig/x86/CONFIG_CAPI_EICON b/baseconfig/x86/CONFIG_CAPI_EICON
deleted file mode 100644
index 70c2616e4..000000000
--- a/baseconfig/x86/CONFIG_CAPI_EICON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CAPI_EICON=y
diff --git a/baseconfig/x86/CONFIG_CC_STACKPROTECTOR b/baseconfig/x86/CONFIG_CC_STACKPROTECTOR
deleted file mode 100644
index ffba31f93..000000000
--- a/baseconfig/x86/CONFIG_CC_STACKPROTECTOR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CC_STACKPROTECTOR=y
diff --git a/baseconfig/x86/CONFIG_CC_STACKPROTECTOR_STRONG b/baseconfig/x86/CONFIG_CC_STACKPROTECTOR_STRONG
deleted file mode 100644
index ce5cb4d04..000000000
--- a/baseconfig/x86/CONFIG_CC_STACKPROTECTOR_STRONG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CC_STACKPROTECTOR_STRONG=y
diff --git a/baseconfig/x86/CONFIG_CHROMEOS_LAPTOP b/baseconfig/x86/CONFIG_CHROMEOS_LAPTOP
deleted file mode 100644
index f4f4c562c..000000000
--- a/baseconfig/x86/CONFIG_CHROMEOS_LAPTOP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CHROMEOS_LAPTOP=m
diff --git a/baseconfig/x86/CONFIG_CHROMEOS_PSTORE b/baseconfig/x86/CONFIG_CHROMEOS_PSTORE
deleted file mode 100644
index 7ece6441d..000000000
--- a/baseconfig/x86/CONFIG_CHROMEOS_PSTORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CHROMEOS_PSTORE=m
diff --git a/baseconfig/x86/CONFIG_CMDLINE_BOOL b/baseconfig/x86/CONFIG_CMDLINE_BOOL
deleted file mode 100644
index ca23a06ea..000000000
--- a/baseconfig/x86/CONFIG_CMDLINE_BOOL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CMDLINE_BOOL is not set
diff --git a/baseconfig/x86/CONFIG_COMPAL_LAPTOP b/baseconfig/x86/CONFIG_COMPAL_LAPTOP
deleted file mode 100644
index 84994e177..000000000
--- a/baseconfig/x86/CONFIG_COMPAL_LAPTOP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_COMPAL_LAPTOP=m
diff --git a/baseconfig/x86/CONFIG_COMPAT_VDSO b/baseconfig/x86/CONFIG_COMPAT_VDSO
deleted file mode 100644
index a79844faa..000000000
--- a/baseconfig/x86/CONFIG_COMPAT_VDSO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_COMPAT_VDSO is not set
diff --git a/baseconfig/x86/CONFIG_CONFIG_PINCTRL_LEWISBURG b/baseconfig/x86/CONFIG_CONFIG_PINCTRL_LEWISBURG
deleted file mode 100644
index c2c51192e..000000000
--- a/baseconfig/x86/CONFIG_CONFIG_PINCTRL_LEWISBURG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_LEWISBURG=m
diff --git a/baseconfig/x86/CONFIG_CPA_DEBUG b/baseconfig/x86/CONFIG_CPA_DEBUG
deleted file mode 100644
index d87a4d235..000000000
--- a/baseconfig/x86/CONFIG_CPA_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CPA_DEBUG is not set
diff --git a/baseconfig/x86/CONFIG_CRC_PMIC_OPREGION b/baseconfig/x86/CONFIG_CRC_PMIC_OPREGION
deleted file mode 100644
index cf61babe7..000000000
--- a/baseconfig/x86/CONFIG_CRC_PMIC_OPREGION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRC_PMIC_OPREGION=y
diff --git a/baseconfig/x86/CONFIG_CRYPTO_AES_NI_INTEL b/baseconfig/x86/CONFIG_CRYPTO_AES_NI_INTEL
deleted file mode 100644
index 7f29bd9bc..000000000
--- a/baseconfig/x86/CONFIG_CRYPTO_AES_NI_INTEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_AES_NI_INTEL=y
diff --git a/baseconfig/x86/CONFIG_CRYPTO_CRC32C_INTEL b/baseconfig/x86/CONFIG_CRYPTO_CRC32C_INTEL
deleted file mode 100644
index c500b4f55..000000000
--- a/baseconfig/x86/CONFIG_CRYPTO_CRC32C_INTEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CRC32C_INTEL=m
diff --git a/baseconfig/x86/CONFIG_CRYPTO_CRC32_PCLMUL b/baseconfig/x86/CONFIG_CRYPTO_CRC32_PCLMUL
deleted file mode 100644
index c503f02e3..000000000
--- a/baseconfig/x86/CONFIG_CRYPTO_CRC32_PCLMUL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CRC32_PCLMUL=m
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_CCP b/baseconfig/x86/CONFIG_CRYPTO_DEV_CCP
deleted file mode 100644
index d2f5497f2..000000000
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_CCP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_CCP=y
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_CCP_CRYPTO b/baseconfig/x86/CONFIG_CRYPTO_DEV_CCP_CRYPTO
deleted file mode 100644
index 4887c6d76..000000000
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_CCP_CRYPTO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_CCP_DD b/baseconfig/x86/CONFIG_CRYPTO_DEV_CCP_DD
deleted file mode 100644
index 18c7b900e..000000000
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_CCP_DD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_CCP_DD=m
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK b/baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK
deleted file mode 100644
index 8a6e8e6cb..000000000
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_PADLOCK=m
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK_AES b/baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK_AES
deleted file mode 100644
index fed2a47ff..000000000
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK_AES
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK_SHA b/baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK_SHA
deleted file mode 100644
index 7f043e865..000000000
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_PADLOCK_SHA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C3XXX b/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C3XXX
deleted file mode 100644
index 9fcd620a9..000000000
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C3XXX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_QAT_C3XXX=m
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C3XXXVF b/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C3XXXVF
deleted file mode 100644
index 9e5c62053..000000000
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C3XXXVF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C62X b/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C62X
deleted file mode 100644
index 2583c47f2..000000000
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C62X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_QAT_C62X=m
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C62XVF b/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C62XVF
deleted file mode 100644
index 589fd67c5..000000000
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_C62XVF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_QAT_C62XVF=m
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_DH895xCC b/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_DH895xCC
deleted file mode 100644
index 3d37c7af5..000000000
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_DH895xCC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
diff --git a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_DH895xCCVF b/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_DH895xCCVF
deleted file mode 100644
index 803571298..000000000
--- a/baseconfig/x86/CONFIG_CRYPTO_DEV_QAT_DH895xCCVF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
diff --git a/baseconfig/x86/CONFIG_CRYPTO_SERPENT_SSE2_586 b/baseconfig/x86/CONFIG_CRYPTO_SERPENT_SSE2_586
deleted file mode 100644
index 04c5548f4..000000000
--- a/baseconfig/x86/CONFIG_CRYPTO_SERPENT_SSE2_586
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_SERPENT_SSE2_586=m
diff --git a/baseconfig/x86/CONFIG_DCDBAS b/baseconfig/x86/CONFIG_DCDBAS
deleted file mode 100644
index 1e2e74b31..000000000
--- a/baseconfig/x86/CONFIG_DCDBAS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DCDBAS=m
diff --git a/baseconfig/x86/CONFIG_DEBUG_ENTRY b/baseconfig/x86/CONFIG_DEBUG_ENTRY
deleted file mode 100644
index 88cb6da08..000000000
--- a/baseconfig/x86/CONFIG_DEBUG_ENTRY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DEBUG_ENTRY is not set
diff --git a/baseconfig/x86/CONFIG_DEBUG_NMI_SELFTEST b/baseconfig/x86/CONFIG_DEBUG_NMI_SELFTEST
deleted file mode 100644
index 4ea92fec1..000000000
--- a/baseconfig/x86/CONFIG_DEBUG_NMI_SELFTEST
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DEBUG_NMI_SELFTEST is not set
diff --git a/baseconfig/x86/CONFIG_DEBUG_PER_CPU_MAPS b/baseconfig/x86/CONFIG_DEBUG_PER_CPU_MAPS
deleted file mode 100644
index 01ead7281..000000000
--- a/baseconfig/x86/CONFIG_DEBUG_PER_CPU_MAPS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
diff --git a/baseconfig/x86/CONFIG_DEBUG_STACKOVERFLOW b/baseconfig/x86/CONFIG_DEBUG_STACKOVERFLOW
deleted file mode 100644
index 09bb42611..000000000
--- a/baseconfig/x86/CONFIG_DEBUG_STACKOVERFLOW
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEBUG_STACKOVERFLOW=y
diff --git a/baseconfig/x86/CONFIG_DEBUG_TLBFLUSH b/baseconfig/x86/CONFIG_DEBUG_TLBFLUSH
deleted file mode 100644
index 6544b79a8..000000000
--- a/baseconfig/x86/CONFIG_DEBUG_TLBFLUSH
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DEBUG_TLBFLUSH is not set
diff --git a/baseconfig/x86/CONFIG_DEBUG_WX b/baseconfig/x86/CONFIG_DEBUG_WX
deleted file mode 100644
index 95e08f44b..000000000
--- a/baseconfig/x86/CONFIG_DEBUG_WX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEBUG_WX=y
diff --git a/baseconfig/x86/CONFIG_DELL_LAPTOP b/baseconfig/x86/CONFIG_DELL_LAPTOP
deleted file mode 100644
index 73d85e891..000000000
--- a/baseconfig/x86/CONFIG_DELL_LAPTOP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DELL_LAPTOP=m
diff --git a/baseconfig/x86/CONFIG_DELL_RBTN b/baseconfig/x86/CONFIG_DELL_RBTN
deleted file mode 100644
index 2aa364473..000000000
--- a/baseconfig/x86/CONFIG_DELL_RBTN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DELL_RBTN=m
diff --git a/baseconfig/x86/CONFIG_DELL_RBU b/baseconfig/x86/CONFIG_DELL_RBU
deleted file mode 100644
index 1cb8995ad..000000000
--- a/baseconfig/x86/CONFIG_DELL_RBU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DELL_RBU is not set
diff --git a/baseconfig/x86/CONFIG_DELL_SMBIOS b/baseconfig/x86/CONFIG_DELL_SMBIOS
deleted file mode 100644
index 1a021a6b6..000000000
--- a/baseconfig/x86/CONFIG_DELL_SMBIOS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DELL_SMBIOS=m
diff --git a/baseconfig/x86/CONFIG_DELL_SMO8800 b/baseconfig/x86/CONFIG_DELL_SMO8800
deleted file mode 100644
index a65967ee2..000000000
--- a/baseconfig/x86/CONFIG_DELL_SMO8800
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DELL_SMO8800=m
diff --git a/baseconfig/x86/CONFIG_DELL_WMI b/baseconfig/x86/CONFIG_DELL_WMI
deleted file mode 100644
index c5924ffe8..000000000
--- a/baseconfig/x86/CONFIG_DELL_WMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DELL_WMI=m
diff --git a/baseconfig/x86/CONFIG_DELL_WMI_AIO b/baseconfig/x86/CONFIG_DELL_WMI_AIO
deleted file mode 100644
index f650f3f1f..000000000
--- a/baseconfig/x86/CONFIG_DELL_WMI_AIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DELL_WMI_AIO=m
diff --git a/baseconfig/x86/CONFIG_DELL_WMI_LED b/baseconfig/x86/CONFIG_DELL_WMI_LED
deleted file mode 100644
index 23d945e59..000000000
--- a/baseconfig/x86/CONFIG_DELL_WMI_LED
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DELL_WMI_LED=m
diff --git a/baseconfig/x86/CONFIG_DMIID b/baseconfig/x86/CONFIG_DMIID
deleted file mode 100644
index d0ea3622a..000000000
--- a/baseconfig/x86/CONFIG_DMIID
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DMIID=y
diff --git a/baseconfig/x86/CONFIG_DMI_SYSFS b/baseconfig/x86/CONFIG_DMI_SYSFS
deleted file mode 100644
index 76565caf8..000000000
--- a/baseconfig/x86/CONFIG_DMI_SYSFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DMI_SYSFS=y
diff --git a/baseconfig/x86/CONFIG_DPTF_POWER b/baseconfig/x86/CONFIG_DPTF_POWER
deleted file mode 100644
index d5825880a..000000000
--- a/baseconfig/x86/CONFIG_DPTF_POWER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DPTF_POWER=m
diff --git a/baseconfig/x86/CONFIG_DRM_GMA3600 b/baseconfig/x86/CONFIG_DRM_GMA3600
deleted file mode 100644
index 52caac51a..000000000
--- a/baseconfig/x86/CONFIG_DRM_GMA3600
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_GMA3600=y
diff --git a/baseconfig/x86/CONFIG_DRM_GMA500 b/baseconfig/x86/CONFIG_DRM_GMA500
deleted file mode 100644
index 38ba65200..000000000
--- a/baseconfig/x86/CONFIG_DRM_GMA500
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_GMA500=m
diff --git a/baseconfig/x86/CONFIG_DRM_GMA600 b/baseconfig/x86/CONFIG_DRM_GMA600
deleted file mode 100644
index 78655acb6..000000000
--- a/baseconfig/x86/CONFIG_DRM_GMA600
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_GMA600 is not set
diff --git a/baseconfig/x86/CONFIG_DRM_I810 b/baseconfig/x86/CONFIG_DRM_I810
deleted file mode 100644
index 23cc8b602..000000000
--- a/baseconfig/x86/CONFIG_DRM_I810
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_I810 is not set
diff --git a/baseconfig/x86/CONFIG_DRM_I915 b/baseconfig/x86/CONFIG_DRM_I915
deleted file mode 100644
index 1034adf42..000000000
--- a/baseconfig/x86/CONFIG_DRM_I915
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_I915=m
diff --git a/baseconfig/x86/CONFIG_DRM_I915_ALPHA_SUPPORT b/baseconfig/x86/CONFIG_DRM_I915_ALPHA_SUPPORT
deleted file mode 100644
index 49c76cb99..000000000
--- a/baseconfig/x86/CONFIG_DRM_I915_ALPHA_SUPPORT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
diff --git a/baseconfig/x86/CONFIG_DRM_I915_CAPTURE_ERROR b/baseconfig/x86/CONFIG_DRM_I915_CAPTURE_ERROR
deleted file mode 100644
index d85c72035..000000000
--- a/baseconfig/x86/CONFIG_DRM_I915_CAPTURE_ERROR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_I915_CAPTURE_ERROR=y
diff --git a/baseconfig/x86/CONFIG_DRM_I915_COMPRESS_ERROR b/baseconfig/x86/CONFIG_DRM_I915_COMPRESS_ERROR
deleted file mode 100644
index 6d6c129f5..000000000
--- a/baseconfig/x86/CONFIG_DRM_I915_COMPRESS_ERROR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_I915_COMPRESS_ERROR=y
diff --git a/baseconfig/x86/CONFIG_DRM_I915_DEBUG_VBLANK_EVADE b/baseconfig/x86/CONFIG_DRM_I915_DEBUG_VBLANK_EVADE
deleted file mode 100644
index d48518abd..000000000
--- a/baseconfig/x86/CONFIG_DRM_I915_DEBUG_VBLANK_EVADE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
diff --git a/baseconfig/x86/CONFIG_DRM_I915_GVT b/baseconfig/x86/CONFIG_DRM_I915_GVT
deleted file mode 100644
index c6af3c3cc..000000000
--- a/baseconfig/x86/CONFIG_DRM_I915_GVT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_I915_GVT=y
diff --git a/baseconfig/x86/CONFIG_DRM_I915_GVT_KVMGT b/baseconfig/x86/CONFIG_DRM_I915_GVT_KVMGT
deleted file mode 100644
index 016a41e8a..000000000
--- a/baseconfig/x86/CONFIG_DRM_I915_GVT_KVMGT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_I915_GVT_KVMGT=m
diff --git a/baseconfig/x86/CONFIG_DRM_I915_USERPTR b/baseconfig/x86/CONFIG_DRM_I915_USERPTR
deleted file mode 100644
index 4f253abc1..000000000
--- a/baseconfig/x86/CONFIG_DRM_I915_USERPTR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_I915_USERPTR=y
diff --git a/baseconfig/x86/CONFIG_DRM_PANEL b/baseconfig/x86/CONFIG_DRM_PANEL
deleted file mode 100644
index de8a9c247..000000000
--- a/baseconfig/x86/CONFIG_DRM_PANEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_PANEL=y
diff --git a/baseconfig/x86/CONFIG_DRM_PANEL_LVDS b/baseconfig/x86/CONFIG_DRM_PANEL_LVDS
deleted file mode 100644
index 6d4d3c7c6..000000000
--- a/baseconfig/x86/CONFIG_DRM_PANEL_LVDS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_PANEL_LVDS=m
diff --git a/baseconfig/x86/CONFIG_DRM_VBOXVIDEO b/baseconfig/x86/CONFIG_DRM_VBOXVIDEO
deleted file mode 100644
index 8597a5dbb..000000000
--- a/baseconfig/x86/CONFIG_DRM_VBOXVIDEO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_VBOXVIDEO=m
diff --git a/baseconfig/x86/CONFIG_DRM_VMWGFX b/baseconfig/x86/CONFIG_DRM_VMWGFX
deleted file mode 100644
index 12fe6b15f..000000000
--- a/baseconfig/x86/CONFIG_DRM_VMWGFX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_VMWGFX=m
diff --git a/baseconfig/x86/CONFIG_DRM_VMWGFX_FBCON b/baseconfig/x86/CONFIG_DRM_VMWGFX_FBCON
deleted file mode 100644
index cc51e115d..000000000
--- a/baseconfig/x86/CONFIG_DRM_VMWGFX_FBCON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_VMWGFX_FBCON=y
diff --git a/baseconfig/x86/CONFIG_DW_DMAC_CORE b/baseconfig/x86/CONFIG_DW_DMAC_CORE
deleted file mode 100644
index 110558a22..000000000
--- a/baseconfig/x86/CONFIG_DW_DMAC_CORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DW_DMAC_CORE=y
diff --git a/baseconfig/x86/CONFIG_DW_DMAC_PCI b/baseconfig/x86/CONFIG_DW_DMAC_PCI
deleted file mode 100644
index 2a2239b24..000000000
--- a/baseconfig/x86/CONFIG_DW_DMAC_PCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DW_DMAC_PCI=y
diff --git a/baseconfig/x86/CONFIG_E1000E_HWTS b/baseconfig/x86/CONFIG_E1000E_HWTS
deleted file mode 100644
index 9b00c96b4..000000000
--- a/baseconfig/x86/CONFIG_E1000E_HWTS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_E1000E_HWTS=y
diff --git a/baseconfig/x86/CONFIG_EADC_AMD64 b/baseconfig/x86/CONFIG_EADC_AMD64
deleted file mode 100644
index 280e18445..000000000
--- a/baseconfig/x86/CONFIG_EADC_AMD64
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EDAC_AMD64 is not set
diff --git a/baseconfig/x86/CONFIG_EARLY_PRINTK_EFI b/baseconfig/x86/CONFIG_EARLY_PRINTK_EFI
deleted file mode 100644
index b895363c6..000000000
--- a/baseconfig/x86/CONFIG_EARLY_PRINTK_EFI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EARLY_PRINTK_EFI=y
diff --git a/baseconfig/x86/CONFIG_EDAC_AMD8111 b/baseconfig/x86/CONFIG_EDAC_AMD8111
deleted file mode 100644
index b191efff8..000000000
--- a/baseconfig/x86/CONFIG_EDAC_AMD8111
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_AMD8111=m
diff --git a/baseconfig/x86/CONFIG_EDAC_AMD8131 b/baseconfig/x86/CONFIG_EDAC_AMD8131
deleted file mode 100644
index 63a058c5b..000000000
--- a/baseconfig/x86/CONFIG_EDAC_AMD8131
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_AMD8131=m
diff --git a/baseconfig/x86/CONFIG_EDAC_DECODE_MCE b/baseconfig/x86/CONFIG_EDAC_DECODE_MCE
deleted file mode 100644
index e408064da..000000000
--- a/baseconfig/x86/CONFIG_EDAC_DECODE_MCE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_DECODE_MCE=m
diff --git a/baseconfig/x86/CONFIG_EDAC_E752X b/baseconfig/x86/CONFIG_EDAC_E752X
deleted file mode 100644
index 4340af994..000000000
--- a/baseconfig/x86/CONFIG_EDAC_E752X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_E752X=m
diff --git a/baseconfig/x86/CONFIG_EDAC_I3000 b/baseconfig/x86/CONFIG_EDAC_I3000
deleted file mode 100644
index 4f30c3dbb..000000000
--- a/baseconfig/x86/CONFIG_EDAC_I3000
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_I3000=m
diff --git a/baseconfig/x86/CONFIG_EDAC_I3200 b/baseconfig/x86/CONFIG_EDAC_I3200
deleted file mode 100644
index eaf5b3300..000000000
--- a/baseconfig/x86/CONFIG_EDAC_I3200
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_I3200=m
diff --git a/baseconfig/x86/CONFIG_EDAC_I5000 b/baseconfig/x86/CONFIG_EDAC_I5000
deleted file mode 100644
index 42ca260cd..000000000
--- a/baseconfig/x86/CONFIG_EDAC_I5000
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_I5000=m
diff --git a/baseconfig/x86/CONFIG_EDAC_I5100 b/baseconfig/x86/CONFIG_EDAC_I5100
deleted file mode 100644
index 255b23ed3..000000000
--- a/baseconfig/x86/CONFIG_EDAC_I5100
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_I5100=m
diff --git a/baseconfig/x86/CONFIG_EDAC_I5400 b/baseconfig/x86/CONFIG_EDAC_I5400
deleted file mode 100644
index 5cd55fc12..000000000
--- a/baseconfig/x86/CONFIG_EDAC_I5400
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_I5400=m
diff --git a/baseconfig/x86/CONFIG_EDAC_I7300 b/baseconfig/x86/CONFIG_EDAC_I7300
deleted file mode 100644
index d1c3314d7..000000000
--- a/baseconfig/x86/CONFIG_EDAC_I7300
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_I7300=m
diff --git a/baseconfig/x86/CONFIG_EDAC_I7CORE b/baseconfig/x86/CONFIG_EDAC_I7CORE
deleted file mode 100644
index b49e12979..000000000
--- a/baseconfig/x86/CONFIG_EDAC_I7CORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_I7CORE=m
diff --git a/baseconfig/x86/CONFIG_EDAC_I82975X b/baseconfig/x86/CONFIG_EDAC_I82975X
deleted file mode 100644
index 0fff85c4a..000000000
--- a/baseconfig/x86/CONFIG_EDAC_I82975X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_I82975X=m
diff --git a/baseconfig/x86/CONFIG_EDAC_IE31200 b/baseconfig/x86/CONFIG_EDAC_IE31200
deleted file mode 100644
index 1d4b071de..000000000
--- a/baseconfig/x86/CONFIG_EDAC_IE31200
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_IE31200=m
diff --git a/baseconfig/x86/CONFIG_EDAC_X38 b/baseconfig/x86/CONFIG_EDAC_X38
deleted file mode 100644
index 710ecf317..000000000
--- a/baseconfig/x86/CONFIG_EDAC_X38
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_X38=m
diff --git a/baseconfig/x86/CONFIG_EDD b/baseconfig/x86/CONFIG_EDD
deleted file mode 100644
index 9b8a635de..000000000
--- a/baseconfig/x86/CONFIG_EDD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDD=m
diff --git a/baseconfig/x86/CONFIG_EDD_OFF b/baseconfig/x86/CONFIG_EDD_OFF
deleted file mode 100644
index 8e6d55871..000000000
--- a/baseconfig/x86/CONFIG_EDD_OFF
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EDD_OFF is not set
diff --git a/baseconfig/x86/CONFIG_EEEPC_LAPTOP b/baseconfig/x86/CONFIG_EEEPC_LAPTOP
deleted file mode 100644
index b0fe48b00..000000000
--- a/baseconfig/x86/CONFIG_EEEPC_LAPTOP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EEEPC_LAPTOP=m
diff --git a/baseconfig/x86/CONFIG_EEEPC_WMI b/baseconfig/x86/CONFIG_EEEPC_WMI
deleted file mode 100644
index bd7f00ece..000000000
--- a/baseconfig/x86/CONFIG_EEEPC_WMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EEEPC_WMI=m
diff --git a/baseconfig/x86/CONFIG_EFI b/baseconfig/x86/CONFIG_EFI
deleted file mode 100644
index 7dcf2966d..000000000
--- a/baseconfig/x86/CONFIG_EFI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EFI=y
diff --git a/baseconfig/x86/CONFIG_EFIVAR_FS b/baseconfig/x86/CONFIG_EFIVAR_FS
deleted file mode 100644
index 4e151f100..000000000
--- a/baseconfig/x86/CONFIG_EFIVAR_FS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EFIVAR_FS=y
diff --git a/baseconfig/x86/CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT b/baseconfig/x86/CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT
deleted file mode 100644
index 9a27fcc5a..000000000
--- a/baseconfig/x86/CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT=y
diff --git a/baseconfig/x86/CONFIG_EFI_BOOTLOADER_CONTROL b/baseconfig/x86/CONFIG_EFI_BOOTLOADER_CONTROL
deleted file mode 100644
index ca42dfb42..000000000
--- a/baseconfig/x86/CONFIG_EFI_BOOTLOADER_CONTROL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EFI_BOOTLOADER_CONTROL is not set
diff --git a/baseconfig/x86/CONFIG_EFI_CAPSULE_LOADER b/baseconfig/x86/CONFIG_EFI_CAPSULE_LOADER
deleted file mode 100644
index 2cc063216..000000000
--- a/baseconfig/x86/CONFIG_EFI_CAPSULE_LOADER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EFI_CAPSULE_LOADER is not set
diff --git a/baseconfig/x86/CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH b/baseconfig/x86/CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH
deleted file mode 100644
index 4b0b2944d..000000000
--- a/baseconfig/x86/CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH is not set
diff --git a/baseconfig/x86/CONFIG_EFI_FAKE_MEMMAP b/baseconfig/x86/CONFIG_EFI_FAKE_MEMMAP
deleted file mode 100644
index 316a93b97..000000000
--- a/baseconfig/x86/CONFIG_EFI_FAKE_MEMMAP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EFI_FAKE_MEMMAP is not set
diff --git a/baseconfig/x86/CONFIG_EFI_PCDP b/baseconfig/x86/CONFIG_EFI_PCDP
deleted file mode 100644
index ba6437e1b..000000000
--- a/baseconfig/x86/CONFIG_EFI_PCDP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EFI_PCDP=y
diff --git a/baseconfig/x86/CONFIG_EFI_RUNTIME_MAP b/baseconfig/x86/CONFIG_EFI_RUNTIME_MAP
deleted file mode 100644
index 3a4462f39..000000000
--- a/baseconfig/x86/CONFIG_EFI_RUNTIME_MAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EFI_RUNTIME_MAP=y
diff --git a/baseconfig/x86/CONFIG_EFI_SECURE_BOOT_LOCK_DOWN b/baseconfig/x86/CONFIG_EFI_SECURE_BOOT_LOCK_DOWN
deleted file mode 100644
index a8b3307f2..000000000
--- a/baseconfig/x86/CONFIG_EFI_SECURE_BOOT_LOCK_DOWN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EFI_SECURE_BOOT_LOCK_DOWN=y
diff --git a/baseconfig/x86/CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE b/baseconfig/x86/CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
deleted file mode 100644
index 3231dd8c4..000000000
--- a/baseconfig/x86/CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE=y
diff --git a/baseconfig/x86/CONFIG_EFI_SIGNATURE_LIST_PARSER b/baseconfig/x86/CONFIG_EFI_SIGNATURE_LIST_PARSER
deleted file mode 100644
index 9671a3c39..000000000
--- a/baseconfig/x86/CONFIG_EFI_SIGNATURE_LIST_PARSER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EFI_SIGNATURE_LIST_PARSER=y
diff --git a/baseconfig/x86/CONFIG_EFI_STUB b/baseconfig/x86/CONFIG_EFI_STUB
deleted file mode 100644
index c8859686c..000000000
--- a/baseconfig/x86/CONFIG_EFI_STUB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EFI_STUB=y
diff --git a/baseconfig/x86/CONFIG_EFI_VARS b/baseconfig/x86/CONFIG_EFI_VARS
deleted file mode 100644
index 36e518c98..000000000
--- a/baseconfig/x86/CONFIG_EFI_VARS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EFI_VARS is not set
diff --git a/baseconfig/x86/CONFIG_EFI_VARS_PSTORE b/baseconfig/x86/CONFIG_EFI_VARS_PSTORE
deleted file mode 100644
index 036e31942..000000000
--- a/baseconfig/x86/CONFIG_EFI_VARS_PSTORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EFI_VARS_PSTORE is not set
diff --git a/baseconfig/x86/CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE b/baseconfig/x86/CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE
deleted file mode 100644
index a8eb13a8a..000000000
--- a/baseconfig/x86/CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
diff --git a/baseconfig/x86/CONFIG_ENA_ETHERNET b/baseconfig/x86/CONFIG_ENA_ETHERNET
deleted file mode 100644
index 64c0a73c1..000000000
--- a/baseconfig/x86/CONFIG_ENA_ETHERNET
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ENA_ETHERNET=m
diff --git a/baseconfig/x86/CONFIG_EXTCON b/baseconfig/x86/CONFIG_EXTCON
deleted file mode 100644
index bde29bcfc..000000000
--- a/baseconfig/x86/CONFIG_EXTCON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXTCON=y
diff --git a/baseconfig/x86/CONFIG_EXTCON_GPIO b/baseconfig/x86/CONFIG_EXTCON_GPIO
deleted file mode 100644
index 87ca2bd05..000000000
--- a/baseconfig/x86/CONFIG_EXTCON_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EXTCON_GPIO is not set
diff --git a/baseconfig/x86/CONFIG_EXTCON_INTEL_INT3496 b/baseconfig/x86/CONFIG_EXTCON_INTEL_INT3496
deleted file mode 100644
index 3f6c5d6f5..000000000
--- a/baseconfig/x86/CONFIG_EXTCON_INTEL_INT3496
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXTCON_INTEL_INT3496=m
diff --git a/baseconfig/x86/CONFIG_EXTCON_MAX3355 b/baseconfig/x86/CONFIG_EXTCON_MAX3355
deleted file mode 100644
index 680b5a774..000000000
--- a/baseconfig/x86/CONFIG_EXTCON_MAX3355
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EXTCON_MAX3355 is not set
diff --git a/baseconfig/x86/CONFIG_EXTCON_RT8973A b/baseconfig/x86/CONFIG_EXTCON_RT8973A
deleted file mode 100644
index e5f7236c9..000000000
--- a/baseconfig/x86/CONFIG_EXTCON_RT8973A
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EXTCON_RT8973A is not set
diff --git a/baseconfig/x86/CONFIG_EXTCON_SM5502 b/baseconfig/x86/CONFIG_EXTCON_SM5502
deleted file mode 100644
index 916994aa9..000000000
--- a/baseconfig/x86/CONFIG_EXTCON_SM5502
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EXTCON_SM5502 is not set
diff --git a/baseconfig/x86/CONFIG_EXTCON_USB_GPIO b/baseconfig/x86/CONFIG_EXTCON_USB_GPIO
deleted file mode 100644
index 7a0c9af30..000000000
--- a/baseconfig/x86/CONFIG_EXTCON_USB_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EXTCON_USB_GPIO is not set
diff --git a/baseconfig/x86/CONFIG_F71808E_WDT b/baseconfig/x86/CONFIG_F71808E_WDT
deleted file mode 100644
index 9fc51eb65..000000000
--- a/baseconfig/x86/CONFIG_F71808E_WDT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_F71808E_WDT=m
diff --git a/baseconfig/x86/CONFIG_FB_ARC b/baseconfig/x86/CONFIG_FB_ARC
deleted file mode 100644
index 1d66b92f4..000000000
--- a/baseconfig/x86/CONFIG_FB_ARC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_ARC is not set
diff --git a/baseconfig/x86/CONFIG_FB_EFI b/baseconfig/x86/CONFIG_FB_EFI
deleted file mode 100644
index 62adf192c..000000000
--- a/baseconfig/x86/CONFIG_FB_EFI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_EFI=y
diff --git a/baseconfig/x86/CONFIG_FB_GEODE b/baseconfig/x86/CONFIG_FB_GEODE
deleted file mode 100644
index 3c78c584d..000000000
--- a/baseconfig/x86/CONFIG_FB_GEODE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_GEODE is not set
diff --git a/baseconfig/x86/CONFIG_FB_HGA b/baseconfig/x86/CONFIG_FB_HGA
deleted file mode 100644
index 3c3142a1e..000000000
--- a/baseconfig/x86/CONFIG_FB_HGA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_HGA is not set
diff --git a/baseconfig/x86/CONFIG_FB_HYPERV b/baseconfig/x86/CONFIG_FB_HYPERV
deleted file mode 100644
index 06c30d0e7..000000000
--- a/baseconfig/x86/CONFIG_FB_HYPERV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_HYPERV=m
diff --git a/baseconfig/x86/CONFIG_FB_I810 b/baseconfig/x86/CONFIG_FB_I810
deleted file mode 100644
index 9ef6eca18..000000000
--- a/baseconfig/x86/CONFIG_FB_I810
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_I810=m
diff --git a/baseconfig/x86/CONFIG_FB_I810_GTF b/baseconfig/x86/CONFIG_FB_I810_GTF
deleted file mode 100644
index 71eee1202..000000000
--- a/baseconfig/x86/CONFIG_FB_I810_GTF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_I810_GTF=y
diff --git a/baseconfig/x86/CONFIG_FB_I810_I2C b/baseconfig/x86/CONFIG_FB_I810_I2C
deleted file mode 100644
index 7cfe05740..000000000
--- a/baseconfig/x86/CONFIG_FB_I810_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_I810_I2C=y
diff --git a/baseconfig/x86/CONFIG_FB_LE80578 b/baseconfig/x86/CONFIG_FB_LE80578
deleted file mode 100644
index 327044a84..000000000
--- a/baseconfig/x86/CONFIG_FB_LE80578
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_LE80578 is not set
diff --git a/baseconfig/x86/CONFIG_FB_N411 b/baseconfig/x86/CONFIG_FB_N411
deleted file mode 100644
index 50f6f3584..000000000
--- a/baseconfig/x86/CONFIG_FB_N411
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_N411 is not set
diff --git a/baseconfig/x86/CONFIG_FB_VGA16 b/baseconfig/x86/CONFIG_FB_VGA16
deleted file mode 100644
index 4fa33dfdc..000000000
--- a/baseconfig/x86/CONFIG_FB_VGA16
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_VGA16=m
diff --git a/baseconfig/x86/CONFIG_FB_VIA b/baseconfig/x86/CONFIG_FB_VIA
deleted file mode 100644
index d34242c33..000000000
--- a/baseconfig/x86/CONFIG_FB_VIA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_VIA is not set
diff --git a/baseconfig/x86/CONFIG_FB_VIA_DIRECT_PROCFS b/baseconfig/x86/CONFIG_FB_VIA_DIRECT_PROCFS
deleted file mode 100644
index d2ff4278d..000000000
--- a/baseconfig/x86/CONFIG_FB_VIA_DIRECT_PROCFS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
diff --git a/baseconfig/x86/CONFIG_FUJITSU_ES b/baseconfig/x86/CONFIG_FUJITSU_ES
deleted file mode 100644
index 2c1643a52..000000000
--- a/baseconfig/x86/CONFIG_FUJITSU_ES
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FUJITSU_ES=m
diff --git a/baseconfig/x86/CONFIG_FUJITSU_LAPTOP b/baseconfig/x86/CONFIG_FUJITSU_LAPTOP
deleted file mode 100644
index e47131e83..000000000
--- a/baseconfig/x86/CONFIG_FUJITSU_LAPTOP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FUJITSU_LAPTOP=m
diff --git a/baseconfig/x86/CONFIG_FUJITSU_LAPTOP_DEBUG b/baseconfig/x86/CONFIG_FUJITSU_LAPTOP_DEBUG
deleted file mode 100644
index 79b795169..000000000
--- a/baseconfig/x86/CONFIG_FUJITSU_LAPTOP_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
diff --git a/baseconfig/x86/CONFIG_FUJITSU_TABLET b/baseconfig/x86/CONFIG_FUJITSU_TABLET
deleted file mode 100644
index 4e9d1a0a1..000000000
--- a/baseconfig/x86/CONFIG_FUJITSU_TABLET
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FUJITSU_TABLET=m
diff --git a/baseconfig/x86/CONFIG_GENERIC_ISA_DMA b/baseconfig/x86/CONFIG_GENERIC_ISA_DMA
deleted file mode 100644
index 01c179857..000000000
--- a/baseconfig/x86/CONFIG_GENERIC_ISA_DMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GENERIC_ISA_DMA=y
diff --git a/baseconfig/x86/CONFIG_GPIO_104_IDI_48 b/baseconfig/x86/CONFIG_GPIO_104_IDI_48
deleted file mode 100644
index 3f9f19745..000000000
--- a/baseconfig/x86/CONFIG_GPIO_104_IDI_48
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_104_IDI_48 is not set
diff --git a/baseconfig/x86/CONFIG_GPIO_AMD8111 b/baseconfig/x86/CONFIG_GPIO_AMD8111
deleted file mode 100644
index 097d52ce1..000000000
--- a/baseconfig/x86/CONFIG_GPIO_AMD8111
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_AMD8111 is not set
diff --git a/baseconfig/x86/CONFIG_GPIO_CRYSTAL_COVE b/baseconfig/x86/CONFIG_GPIO_CRYSTAL_COVE
deleted file mode 100644
index 7c7683203..000000000
--- a/baseconfig/x86/CONFIG_GPIO_CRYSTAL_COVE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_CRYSTAL_COVE=y
diff --git a/baseconfig/x86/CONFIG_GPIO_CS5535 b/baseconfig/x86/CONFIG_GPIO_CS5535
deleted file mode 100644
index 0566d4f6f..000000000
--- a/baseconfig/x86/CONFIG_GPIO_CS5535
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_CS5535 is not set
diff --git a/baseconfig/x86/CONFIG_GPIO_F7188X b/baseconfig/x86/CONFIG_GPIO_F7188X
deleted file mode 100644
index 4ab26719d..000000000
--- a/baseconfig/x86/CONFIG_GPIO_F7188X
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_F7188X is not set
diff --git a/baseconfig/x86/CONFIG_GPIO_ICH b/baseconfig/x86/CONFIG_GPIO_ICH
deleted file mode 100644
index 7712d0516..000000000
--- a/baseconfig/x86/CONFIG_GPIO_ICH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_ICH=m
diff --git a/baseconfig/x86/CONFIG_GPIO_INTEL_MID b/baseconfig/x86/CONFIG_GPIO_INTEL_MID
deleted file mode 100644
index 1fca022bb..000000000
--- a/baseconfig/x86/CONFIG_GPIO_INTEL_MID
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_INTEL_MID is not set
diff --git a/baseconfig/x86/CONFIG_GPIO_IT87 b/baseconfig/x86/CONFIG_GPIO_IT87
deleted file mode 100644
index 00746d711..000000000
--- a/baseconfig/x86/CONFIG_GPIO_IT87
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_IT87=m
diff --git a/baseconfig/x86/CONFIG_GPIO_LYNXPOINT b/baseconfig/x86/CONFIG_GPIO_LYNXPOINT
deleted file mode 100644
index b6a68c3b2..000000000
--- a/baseconfig/x86/CONFIG_GPIO_LYNXPOINT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_LYNXPOINT is not set
diff --git a/baseconfig/x86/CONFIG_GPIO_ML_IOH b/baseconfig/x86/CONFIG_GPIO_ML_IOH
deleted file mode 100644
index 9155cc76a..000000000
--- a/baseconfig/x86/CONFIG_GPIO_ML_IOH
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_ML_IOH is not set
diff --git a/baseconfig/x86/CONFIG_GPIO_SCH b/baseconfig/x86/CONFIG_GPIO_SCH
deleted file mode 100644
index 91a3ab850..000000000
--- a/baseconfig/x86/CONFIG_GPIO_SCH
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_SCH is not set
diff --git a/baseconfig/x86/CONFIG_GPIO_VX855 b/baseconfig/x86/CONFIG_GPIO_VX855
deleted file mode 100644
index 07b0ce3ab..000000000
--- a/baseconfig/x86/CONFIG_GPIO_VX855
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_VX855 is not set
diff --git a/baseconfig/x86/CONFIG_GPIO_WHISKEY_COVE b/baseconfig/x86/CONFIG_GPIO_WHISKEY_COVE
deleted file mode 100644
index aea3beacf..000000000
--- a/baseconfig/x86/CONFIG_GPIO_WHISKEY_COVE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_WHISKEY_COVE=y
diff --git a/baseconfig/x86/CONFIG_HARDLOCKUP_DETECTOR b/baseconfig/x86/CONFIG_HARDLOCKUP_DETECTOR
deleted file mode 100644
index dc5ae5ce3..000000000
--- a/baseconfig/x86/CONFIG_HARDLOCKUP_DETECTOR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HARDLOCKUP_DETECTOR=y
diff --git a/baseconfig/x86/CONFIG_HDMI_LPE_AUDIO b/baseconfig/x86/CONFIG_HDMI_LPE_AUDIO
deleted file mode 100644
index a901acc4d..000000000
--- a/baseconfig/x86/CONFIG_HDMI_LPE_AUDIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HDMI_LPE_AUDIO=m
diff --git a/baseconfig/x86/CONFIG_HID_ASUS b/baseconfig/x86/CONFIG_HID_ASUS
deleted file mode 100644
index efc1ef4f8..000000000
--- a/baseconfig/x86/CONFIG_HID_ASUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HID_ASUS=m
diff --git a/baseconfig/x86/CONFIG_HID_HYPERV_MOUSE b/baseconfig/x86/CONFIG_HID_HYPERV_MOUSE
deleted file mode 100644
index 2089444e5..000000000
--- a/baseconfig/x86/CONFIG_HID_HYPERV_MOUSE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HID_HYPERV_MOUSE=m
diff --git a/baseconfig/x86/CONFIG_HOTPLUG_PCI_COMPAQ b/baseconfig/x86/CONFIG_HOTPLUG_PCI_COMPAQ
deleted file mode 100644
index 9714f8806..000000000
--- a/baseconfig/x86/CONFIG_HOTPLUG_PCI_COMPAQ
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HOTPLUG_PCI_COMPAQ=m
diff --git a/baseconfig/x86/CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM b/baseconfig/x86/CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM
deleted file mode 100644
index 67ee2d252..000000000
--- a/baseconfig/x86/CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
diff --git a/baseconfig/x86/CONFIG_HOTPLUG_PCI_IBM b/baseconfig/x86/CONFIG_HOTPLUG_PCI_IBM
deleted file mode 100644
index 855d684ca..000000000
--- a/baseconfig/x86/CONFIG_HOTPLUG_PCI_IBM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HOTPLUG_PCI_IBM=m
diff --git a/baseconfig/x86/CONFIG_HPET b/baseconfig/x86/CONFIG_HPET
deleted file mode 100644
index 9ac1b11db..000000000
--- a/baseconfig/x86/CONFIG_HPET
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HPET=y
diff --git a/baseconfig/x86/CONFIG_HPET_MMAP b/baseconfig/x86/CONFIG_HPET_MMAP
deleted file mode 100644
index 9d7890659..000000000
--- a/baseconfig/x86/CONFIG_HPET_MMAP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_HPET_MMAP is not set
diff --git a/baseconfig/x86/CONFIG_HPET_TIMER b/baseconfig/x86/CONFIG_HPET_TIMER
deleted file mode 100644
index 381266e17..000000000
--- a/baseconfig/x86/CONFIG_HPET_TIMER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HPET_TIMER=y
diff --git a/baseconfig/x86/CONFIG_HPWDT_NMI_DECODING b/baseconfig/x86/CONFIG_HPWDT_NMI_DECODING
deleted file mode 100644
index 2f21b282d..000000000
--- a/baseconfig/x86/CONFIG_HPWDT_NMI_DECODING
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HPWDT_NMI_DECODING=y
diff --git a/baseconfig/x86/CONFIG_HP_ACCEL b/baseconfig/x86/CONFIG_HP_ACCEL
deleted file mode 100644
index 7aade2bc1..000000000
--- a/baseconfig/x86/CONFIG_HP_ACCEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HP_ACCEL=m
diff --git a/baseconfig/x86/CONFIG_HP_ILO b/baseconfig/x86/CONFIG_HP_ILO
deleted file mode 100644
index 1d3256354..000000000
--- a/baseconfig/x86/CONFIG_HP_ILO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HP_ILO=m
diff --git a/baseconfig/x86/CONFIG_HP_WATCHDOG b/baseconfig/x86/CONFIG_HP_WATCHDOG
deleted file mode 100644
index 9a829b4e9..000000000
--- a/baseconfig/x86/CONFIG_HP_WATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HP_WATCHDOG=m
diff --git a/baseconfig/x86/CONFIG_HP_WIRELESS b/baseconfig/x86/CONFIG_HP_WIRELESS
deleted file mode 100644
index e371ddd0d..000000000
--- a/baseconfig/x86/CONFIG_HP_WIRELESS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HP_WIRELESS=m
diff --git a/baseconfig/x86/CONFIG_HP_WMI b/baseconfig/x86/CONFIG_HP_WMI
deleted file mode 100644
index 078d5d53f..000000000
--- a/baseconfig/x86/CONFIG_HP_WMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HP_WMI=m
diff --git a/baseconfig/x86/CONFIG_HVC_XEN b/baseconfig/x86/CONFIG_HVC_XEN
deleted file mode 100644
index df97a05c7..000000000
--- a/baseconfig/x86/CONFIG_HVC_XEN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HVC_XEN=y
diff --git a/baseconfig/x86/CONFIG_HVC_XEN_FRONTEND b/baseconfig/x86/CONFIG_HVC_XEN_FRONTEND
deleted file mode 100644
index 02ccaac13..000000000
--- a/baseconfig/x86/CONFIG_HVC_XEN_FRONTEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HVC_XEN_FRONTEND=y
diff --git a/baseconfig/x86/CONFIG_HW_RANDOM_AMD b/baseconfig/x86/CONFIG_HW_RANDOM_AMD
deleted file mode 100644
index dd7a51f3d..000000000
--- a/baseconfig/x86/CONFIG_HW_RANDOM_AMD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HW_RANDOM_AMD=m
diff --git a/baseconfig/x86/CONFIG_HW_RANDOM_INTEL b/baseconfig/x86/CONFIG_HW_RANDOM_INTEL
deleted file mode 100644
index 8929685e6..000000000
--- a/baseconfig/x86/CONFIG_HW_RANDOM_INTEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HW_RANDOM_INTEL=m
diff --git a/baseconfig/x86/CONFIG_HW_RANDOM_VIA b/baseconfig/x86/CONFIG_HW_RANDOM_VIA
deleted file mode 100644
index 9b9c51231..000000000
--- a/baseconfig/x86/CONFIG_HW_RANDOM_VIA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HW_RANDOM_VIA=m
diff --git a/baseconfig/x86/CONFIG_HYPERV b/baseconfig/x86/CONFIG_HYPERV
deleted file mode 100644
index 586091822..000000000
--- a/baseconfig/x86/CONFIG_HYPERV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HYPERV=m
diff --git a/baseconfig/x86/CONFIG_HYPERVISOR_GUEST b/baseconfig/x86/CONFIG_HYPERVISOR_GUEST
deleted file mode 100644
index 2770560d5..000000000
--- a/baseconfig/x86/CONFIG_HYPERVISOR_GUEST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HYPERVISOR_GUEST=y
diff --git a/baseconfig/x86/CONFIG_HYPERV_BALLOON b/baseconfig/x86/CONFIG_HYPERV_BALLOON
deleted file mode 100644
index b1f01cbe4..000000000
--- a/baseconfig/x86/CONFIG_HYPERV_BALLOON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HYPERV_BALLOON=m
diff --git a/baseconfig/x86/CONFIG_HYPERV_KEYBOARD b/baseconfig/x86/CONFIG_HYPERV_KEYBOARD
deleted file mode 100644
index 25dccab6b..000000000
--- a/baseconfig/x86/CONFIG_HYPERV_KEYBOARD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HYPERV_KEYBOARD=m
diff --git a/baseconfig/x86/CONFIG_HYPERV_NET b/baseconfig/x86/CONFIG_HYPERV_NET
deleted file mode 100644
index ecacee715..000000000
--- a/baseconfig/x86/CONFIG_HYPERV_NET
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HYPERV_NET=m
diff --git a/baseconfig/x86/CONFIG_HYPERV_STORAGE b/baseconfig/x86/CONFIG_HYPERV_STORAGE
deleted file mode 100644
index 6782fa59b..000000000
--- a/baseconfig/x86/CONFIG_HYPERV_STORAGE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HYPERV_STORAGE=m
diff --git a/baseconfig/x86/CONFIG_HYPERV_UTILS b/baseconfig/x86/CONFIG_HYPERV_UTILS
deleted file mode 100644
index 9b8c0d2a4..000000000
--- a/baseconfig/x86/CONFIG_HYPERV_UTILS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HYPERV_UTILS=m
diff --git a/baseconfig/x86/CONFIG_HYPERV_VSOCKETS b/baseconfig/x86/CONFIG_HYPERV_VSOCKETS
deleted file mode 100644
index bd21cd675..000000000
--- a/baseconfig/x86/CONFIG_HYPERV_VSOCKETS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HYPERV_VSOCKETS=m
diff --git a/baseconfig/x86/CONFIG_I2C b/baseconfig/x86/CONFIG_I2C
deleted file mode 100644
index aafb657f5..000000000
--- a/baseconfig/x86/CONFIG_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C=y
diff --git a/baseconfig/x86/CONFIG_I2C_AMD756 b/baseconfig/x86/CONFIG_I2C_AMD756
deleted file mode 100644
index 760d8bd42..000000000
--- a/baseconfig/x86/CONFIG_I2C_AMD756
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_AMD756=m
diff --git a/baseconfig/x86/CONFIG_I2C_AMD756_S4882 b/baseconfig/x86/CONFIG_I2C_AMD756_S4882
deleted file mode 100644
index 32da34a3e..000000000
--- a/baseconfig/x86/CONFIG_I2C_AMD756_S4882
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_AMD756_S4882=m
diff --git a/baseconfig/x86/CONFIG_I2C_AMD8111 b/baseconfig/x86/CONFIG_I2C_AMD8111
deleted file mode 100644
index 3359257cd..000000000
--- a/baseconfig/x86/CONFIG_I2C_AMD8111
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_AMD8111=m
diff --git a/baseconfig/x86/CONFIG_I2C_DESIGNWARE_BAYTRAIL b/baseconfig/x86/CONFIG_I2C_DESIGNWARE_BAYTRAIL
deleted file mode 100644
index 88e9c546e..000000000
--- a/baseconfig/x86/CONFIG_I2C_DESIGNWARE_BAYTRAIL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
diff --git a/baseconfig/x86/CONFIG_I2C_DESIGNWARE_CORE b/baseconfig/x86/CONFIG_I2C_DESIGNWARE_CORE
deleted file mode 100644
index f9cdc633b..000000000
--- a/baseconfig/x86/CONFIG_I2C_DESIGNWARE_CORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_DESIGNWARE_CORE=y
diff --git a/baseconfig/x86/CONFIG_I2C_DESIGNWARE_PLATFORM b/baseconfig/x86/CONFIG_I2C_DESIGNWARE_PLATFORM
deleted file mode 100644
index 3d50a3e8a..000000000
--- a/baseconfig/x86/CONFIG_I2C_DESIGNWARE_PLATFORM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
diff --git a/baseconfig/x86/CONFIG_I2C_I801 b/baseconfig/x86/CONFIG_I2C_I801
deleted file mode 100644
index 5d1883a34..000000000
--- a/baseconfig/x86/CONFIG_I2C_I801
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_I801=m
diff --git a/baseconfig/x86/CONFIG_I2C_ISCH b/baseconfig/x86/CONFIG_I2C_ISCH
deleted file mode 100644
index ca084a709..000000000
--- a/baseconfig/x86/CONFIG_I2C_ISCH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_ISCH=m
diff --git a/baseconfig/x86/CONFIG_I2C_ISMT b/baseconfig/x86/CONFIG_I2C_ISMT
deleted file mode 100644
index f720d1bb1..000000000
--- a/baseconfig/x86/CONFIG_I2C_ISMT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_ISMT=m
diff --git a/baseconfig/x86/CONFIG_I2C_NFORCE2 b/baseconfig/x86/CONFIG_I2C_NFORCE2
deleted file mode 100644
index 50bbe34f2..000000000
--- a/baseconfig/x86/CONFIG_I2C_NFORCE2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_NFORCE2=m
diff --git a/baseconfig/x86/CONFIG_I2C_NFORCE2_S4985 b/baseconfig/x86/CONFIG_I2C_NFORCE2_S4985
deleted file mode 100644
index 758a790d2..000000000
--- a/baseconfig/x86/CONFIG_I2C_NFORCE2_S4985
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_NFORCE2_S4985=m
diff --git a/baseconfig/x86/CONFIG_I2C_PARPORT b/baseconfig/x86/CONFIG_I2C_PARPORT
deleted file mode 100644
index 58827a258..000000000
--- a/baseconfig/x86/CONFIG_I2C_PARPORT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_PARPORT=m
diff --git a/baseconfig/x86/CONFIG_I2C_PARPORT_LIGHT b/baseconfig/x86/CONFIG_I2C_PARPORT_LIGHT
deleted file mode 100644
index 1dbc68883..000000000
--- a/baseconfig/x86/CONFIG_I2C_PARPORT_LIGHT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_PARPORT_LIGHT=m
diff --git a/baseconfig/x86/CONFIG_I2C_PIIX4 b/baseconfig/x86/CONFIG_I2C_PIIX4
deleted file mode 100644
index ff0307146..000000000
--- a/baseconfig/x86/CONFIG_I2C_PIIX4
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_PIIX4=m
diff --git a/baseconfig/x86/CONFIG_I2C_PXA b/baseconfig/x86/CONFIG_I2C_PXA
deleted file mode 100644
index 59d18f0cb..000000000
--- a/baseconfig/x86/CONFIG_I2C_PXA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_PXA=m
diff --git a/baseconfig/x86/CONFIG_I2C_PXA_SLAVE b/baseconfig/x86/CONFIG_I2C_PXA_SLAVE
deleted file mode 100644
index 7cc440320..000000000
--- a/baseconfig/x86/CONFIG_I2C_PXA_SLAVE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_PXA_SLAVE is not set
diff --git a/baseconfig/x86/CONFIG_I2C_SCMI b/baseconfig/x86/CONFIG_I2C_SCMI
deleted file mode 100644
index 6e60bd4e1..000000000
--- a/baseconfig/x86/CONFIG_I2C_SCMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_SCMI=m
diff --git a/baseconfig/x86/CONFIG_I2C_SIS96X b/baseconfig/x86/CONFIG_I2C_SIS96X
deleted file mode 100644
index e716d3492..000000000
--- a/baseconfig/x86/CONFIG_I2C_SIS96X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_SIS96X=m
diff --git a/baseconfig/x86/CONFIG_I2C_VIA b/baseconfig/x86/CONFIG_I2C_VIA
deleted file mode 100644
index 4b9475a7b..000000000
--- a/baseconfig/x86/CONFIG_I2C_VIA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_VIA=m
diff --git a/baseconfig/x86/CONFIG_I2C_VIAPRO b/baseconfig/x86/CONFIG_I2C_VIAPRO
deleted file mode 100644
index 93d8303db..000000000
--- a/baseconfig/x86/CONFIG_I2C_VIAPRO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_VIAPRO=m
diff --git a/baseconfig/x86/CONFIG_I8K b/baseconfig/x86/CONFIG_I8K
deleted file mode 100644
index 0ffc1edcc..000000000
--- a/baseconfig/x86/CONFIG_I8K
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I8K=m
diff --git a/baseconfig/x86/CONFIG_IB700_WDT b/baseconfig/x86/CONFIG_IB700_WDT
deleted file mode 100644
index 3cf068abd..000000000
--- a/baseconfig/x86/CONFIG_IB700_WDT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IB700_WDT=m
diff --git a/baseconfig/x86/CONFIG_IBMASR b/baseconfig/x86/CONFIG_IBMASR
deleted file mode 100644
index c5d4eb253..000000000
--- a/baseconfig/x86/CONFIG_IBMASR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IBMASR=m
diff --git a/baseconfig/x86/CONFIG_IBM_ASM b/baseconfig/x86/CONFIG_IBM_ASM
deleted file mode 100644
index caf4c739a..000000000
--- a/baseconfig/x86/CONFIG_IBM_ASM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IBM_ASM=m
diff --git a/baseconfig/x86/CONFIG_IBM_RTL b/baseconfig/x86/CONFIG_IBM_RTL
deleted file mode 100644
index 3a0fee720..000000000
--- a/baseconfig/x86/CONFIG_IBM_RTL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IBM_RTL is not set
diff --git a/baseconfig/x86/CONFIG_IDEAPAD_LAPTOP b/baseconfig/x86/CONFIG_IDEAPAD_LAPTOP
deleted file mode 100644
index 5937dca3e..000000000
--- a/baseconfig/x86/CONFIG_IDEAPAD_LAPTOP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IDEAPAD_LAPTOP=m
diff --git a/baseconfig/x86/CONFIG_IDMA64 b/baseconfig/x86/CONFIG_IDMA64
deleted file mode 100644
index 58c13bbb3..000000000
--- a/baseconfig/x86/CONFIG_IDMA64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IDMA64=m
diff --git a/baseconfig/x86/CONFIG_IE6XX_WDT b/baseconfig/x86/CONFIG_IE6XX_WDT
deleted file mode 100644
index 96368c0af..000000000
--- a/baseconfig/x86/CONFIG_IE6XX_WDT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IE6XX_WDT=m
diff --git a/baseconfig/x86/CONFIG_INFINIBAND_VMWARE_PVRDMA b/baseconfig/x86/CONFIG_INFINIBAND_VMWARE_PVRDMA
deleted file mode 100644
index 164f3b26c..000000000
--- a/baseconfig/x86/CONFIG_INFINIBAND_VMWARE_PVRDMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INFINIBAND_VMWARE_PVRDMA=m
diff --git a/baseconfig/x86/CONFIG_INPUT_SOC_BUTTON_ARRAY b/baseconfig/x86/CONFIG_INPUT_SOC_BUTTON_ARRAY
deleted file mode 100644
index dec62a899..000000000
--- a/baseconfig/x86/CONFIG_INPUT_SOC_BUTTON_ARRAY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
diff --git a/baseconfig/x86/CONFIG_INPUT_XEN_KBDDEV_FRONTEND b/baseconfig/x86/CONFIG_INPUT_XEN_KBDDEV_FRONTEND
deleted file mode 100644
index 9703adaf4..000000000
--- a/baseconfig/x86/CONFIG_INPUT_XEN_KBDDEV_FRONTEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
diff --git a/baseconfig/x86/CONFIG_INT3406_THERMAL b/baseconfig/x86/CONFIG_INT3406_THERMAL
deleted file mode 100644
index b61486c65..000000000
--- a/baseconfig/x86/CONFIG_INT3406_THERMAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INT3406_THERMAL=m
diff --git a/baseconfig/x86/CONFIG_INT340X_THERMAL b/baseconfig/x86/CONFIG_INT340X_THERMAL
deleted file mode 100644
index 1df71f851..000000000
--- a/baseconfig/x86/CONFIG_INT340X_THERMAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INT340X_THERMAL=m
diff --git a/baseconfig/x86/CONFIG_INTEL_ATOMISP b/baseconfig/x86/CONFIG_INTEL_ATOMISP
deleted file mode 100644
index fde06c533..000000000
--- a/baseconfig/x86/CONFIG_INTEL_ATOMISP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INTEL_ATOMISP is not set
diff --git a/baseconfig/x86/CONFIG_INTEL_BXT_PMIC_THERMAL b/baseconfig/x86/CONFIG_INTEL_BXT_PMIC_THERMAL
deleted file mode 100644
index 6207a4474..000000000
--- a/baseconfig/x86/CONFIG_INTEL_BXT_PMIC_THERMAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_BXT_PMIC_THERMAL=m
diff --git a/baseconfig/x86/CONFIG_INTEL_CHT_INT33FE b/baseconfig/x86/CONFIG_INTEL_CHT_INT33FE
deleted file mode 100644
index 7657a9a07..000000000
--- a/baseconfig/x86/CONFIG_INTEL_CHT_INT33FE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_CHT_INT33FE=m
diff --git a/baseconfig/x86/CONFIG_INTEL_HID_EVENT b/baseconfig/x86/CONFIG_INTEL_HID_EVENT
deleted file mode 100644
index db284f9da..000000000
--- a/baseconfig/x86/CONFIG_INTEL_HID_EVENT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_HID_EVENT=m
diff --git a/baseconfig/x86/CONFIG_INTEL_IDLE b/baseconfig/x86/CONFIG_INTEL_IDLE
deleted file mode 100644
index 11c398412..000000000
--- a/baseconfig/x86/CONFIG_INTEL_IDLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_IDLE=y
diff --git a/baseconfig/x86/CONFIG_INTEL_IDMA64 b/baseconfig/x86/CONFIG_INTEL_IDMA64
deleted file mode 100644
index 599b2317e..000000000
--- a/baseconfig/x86/CONFIG_INTEL_IDMA64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_IDMA64=m
diff --git a/baseconfig/x86/CONFIG_INTEL_INT0002_VGPIO b/baseconfig/x86/CONFIG_INTEL_INT0002_VGPIO
deleted file mode 100644
index f416f2ddc..000000000
--- a/baseconfig/x86/CONFIG_INTEL_INT0002_VGPIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INTEL_INT0002_VGPIO is not set
diff --git a/baseconfig/x86/CONFIG_INTEL_IOATDMA b/baseconfig/x86/CONFIG_INTEL_IOATDMA
deleted file mode 100644
index 916ea1727..000000000
--- a/baseconfig/x86/CONFIG_INTEL_IOATDMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_IOATDMA=m
diff --git a/baseconfig/x86/CONFIG_INTEL_IOMMU b/baseconfig/x86/CONFIG_INTEL_IOMMU
deleted file mode 100644
index b21af5c55..000000000
--- a/baseconfig/x86/CONFIG_INTEL_IOMMU
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_IOMMU=y
diff --git a/baseconfig/x86/CONFIG_INTEL_IOMMU_DEFAULT_ON b/baseconfig/x86/CONFIG_INTEL_IOMMU_DEFAULT_ON
deleted file mode 100644
index 65c519e1d..000000000
--- a/baseconfig/x86/CONFIG_INTEL_IOMMU_DEFAULT_ON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
diff --git a/baseconfig/x86/CONFIG_INTEL_IOMMU_FLOPPY_WA b/baseconfig/x86/CONFIG_INTEL_IOMMU_FLOPPY_WA
deleted file mode 100644
index 24e7e07d8..000000000
--- a/baseconfig/x86/CONFIG_INTEL_IOMMU_FLOPPY_WA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
diff --git a/baseconfig/x86/CONFIG_INTEL_IOMMU_SVM b/baseconfig/x86/CONFIG_INTEL_IOMMU_SVM
deleted file mode 100644
index eb03ccae7..000000000
--- a/baseconfig/x86/CONFIG_INTEL_IOMMU_SVM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_IOMMU_SVM=y
diff --git a/baseconfig/x86/CONFIG_INTEL_IPS b/baseconfig/x86/CONFIG_INTEL_IPS
deleted file mode 100644
index 3d5e32159..000000000
--- a/baseconfig/x86/CONFIG_INTEL_IPS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_IPS=m
diff --git a/baseconfig/x86/CONFIG_INTEL_MEI b/baseconfig/x86/CONFIG_INTEL_MEI
deleted file mode 100644
index 15212b9f8..000000000
--- a/baseconfig/x86/CONFIG_INTEL_MEI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_MEI=m
diff --git a/baseconfig/x86/CONFIG_INTEL_MEI_ME b/baseconfig/x86/CONFIG_INTEL_MEI_ME
deleted file mode 100644
index 1592e963b..000000000
--- a/baseconfig/x86/CONFIG_INTEL_MEI_ME
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_MEI_ME=m
diff --git a/baseconfig/x86/CONFIG_INTEL_MEI_TXE b/baseconfig/x86/CONFIG_INTEL_MEI_TXE
deleted file mode 100644
index 359cad436..000000000
--- a/baseconfig/x86/CONFIG_INTEL_MEI_TXE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_MEI_TXE=m
diff --git a/baseconfig/x86/CONFIG_INTEL_MEI_WDT b/baseconfig/x86/CONFIG_INTEL_MEI_WDT
deleted file mode 100644
index a1d5fc1bf..000000000
--- a/baseconfig/x86/CONFIG_INTEL_MEI_WDT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_MEI_WDT=m
diff --git a/baseconfig/x86/CONFIG_INTEL_MENLOW b/baseconfig/x86/CONFIG_INTEL_MENLOW
deleted file mode 100644
index 342cd294b..000000000
--- a/baseconfig/x86/CONFIG_INTEL_MENLOW
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INTEL_MENLOW is not set
diff --git a/baseconfig/x86/CONFIG_INTEL_OAKTRAIL b/baseconfig/x86/CONFIG_INTEL_OAKTRAIL
deleted file mode 100644
index c2cbe39cd..000000000
--- a/baseconfig/x86/CONFIG_INTEL_OAKTRAIL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_OAKTRAIL=m
diff --git a/baseconfig/x86/CONFIG_INTEL_PCH_THERMAL b/baseconfig/x86/CONFIG_INTEL_PCH_THERMAL
deleted file mode 100644
index 626785458..000000000
--- a/baseconfig/x86/CONFIG_INTEL_PCH_THERMAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_PCH_THERMAL=m
diff --git a/baseconfig/x86/CONFIG_INTEL_PMC_CORE b/baseconfig/x86/CONFIG_INTEL_PMC_CORE
deleted file mode 100644
index 4b7233a63..000000000
--- a/baseconfig/x86/CONFIG_INTEL_PMC_CORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_PMC_CORE=y
diff --git a/baseconfig/x86/CONFIG_INTEL_PMC_IPC b/baseconfig/x86/CONFIG_INTEL_PMC_IPC
deleted file mode 100644
index eedef11ac..000000000
--- a/baseconfig/x86/CONFIG_INTEL_PMC_IPC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INTEL_PMC_IPC is not set
diff --git a/baseconfig/x86/CONFIG_INTEL_POWERCLAMP b/baseconfig/x86/CONFIG_INTEL_POWERCLAMP
deleted file mode 100644
index 84f4db21f..000000000
--- a/baseconfig/x86/CONFIG_INTEL_POWERCLAMP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_POWERCLAMP=m
diff --git a/baseconfig/x86/CONFIG_INTEL_PUNIT_IPC b/baseconfig/x86/CONFIG_INTEL_PUNIT_IPC
deleted file mode 100644
index c99b3a524..000000000
--- a/baseconfig/x86/CONFIG_INTEL_PUNIT_IPC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_PUNIT_IPC=m
diff --git a/baseconfig/x86/CONFIG_INTEL_RAPL b/baseconfig/x86/CONFIG_INTEL_RAPL
deleted file mode 100644
index c894934f7..000000000
--- a/baseconfig/x86/CONFIG_INTEL_RAPL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_RAPL=m
diff --git a/baseconfig/x86/CONFIG_INTEL_RDT b/baseconfig/x86/CONFIG_INTEL_RDT
deleted file mode 100644
index 0dcef9a32..000000000
--- a/baseconfig/x86/CONFIG_INTEL_RDT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_RDT=y
diff --git a/baseconfig/x86/CONFIG_INTEL_RDT_A b/baseconfig/x86/CONFIG_INTEL_RDT_A
deleted file mode 100644
index 8c02d1afc..000000000
--- a/baseconfig/x86/CONFIG_INTEL_RDT_A
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_RDT_A=y
diff --git a/baseconfig/x86/CONFIG_INTEL_RST b/baseconfig/x86/CONFIG_INTEL_RST
deleted file mode 100644
index 3a471adf0..000000000
--- a/baseconfig/x86/CONFIG_INTEL_RST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_RST=m
diff --git a/baseconfig/x86/CONFIG_INTEL_SCU_IPC b/baseconfig/x86/CONFIG_INTEL_SCU_IPC
deleted file mode 100644
index e535aec5b..000000000
--- a/baseconfig/x86/CONFIG_INTEL_SCU_IPC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INTEL_SCU_IPC is not set
diff --git a/baseconfig/x86/CONFIG_INTEL_SMARTCONNECT b/baseconfig/x86/CONFIG_INTEL_SMARTCONNECT
deleted file mode 100644
index f0c0a8f22..000000000
--- a/baseconfig/x86/CONFIG_INTEL_SMARTCONNECT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_SMARTCONNECT=y
diff --git a/baseconfig/x86/CONFIG_INTEL_SOC_DTS_THERMAL b/baseconfig/x86/CONFIG_INTEL_SOC_DTS_THERMAL
deleted file mode 100644
index f3b1441e1..000000000
--- a/baseconfig/x86/CONFIG_INTEL_SOC_DTS_THERMAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_SOC_DTS_THERMAL=m
diff --git a/baseconfig/x86/CONFIG_INTEL_SOC_PMIC b/baseconfig/x86/CONFIG_INTEL_SOC_PMIC
deleted file mode 100644
index 2bb94a4d0..000000000
--- a/baseconfig/x86/CONFIG_INTEL_SOC_PMIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_SOC_PMIC=y
diff --git a/baseconfig/x86/CONFIG_INTEL_SOC_PMIC_CHTWC b/baseconfig/x86/CONFIG_INTEL_SOC_PMIC_CHTWC
deleted file mode 100644
index 2d14c0346..000000000
--- a/baseconfig/x86/CONFIG_INTEL_SOC_PMIC_CHTWC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INTEL_SOC_PMIC_CHTWC is not set
diff --git a/baseconfig/x86/CONFIG_INTEL_VBTN b/baseconfig/x86/CONFIG_INTEL_VBTN
deleted file mode 100644
index 62234540a..000000000
--- a/baseconfig/x86/CONFIG_INTEL_VBTN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_VBTN=m
diff --git a/baseconfig/x86/CONFIG_IOMMU_STRESS b/baseconfig/x86/CONFIG_IOMMU_STRESS
deleted file mode 100644
index e4aac8c40..000000000
--- a/baseconfig/x86/CONFIG_IOMMU_STRESS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IOMMU_STRESS is not set
diff --git a/baseconfig/x86/CONFIG_IOSF_MBI b/baseconfig/x86/CONFIG_IOSF_MBI
deleted file mode 100644
index 27b224a56..000000000
--- a/baseconfig/x86/CONFIG_IOSF_MBI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IOSF_MBI=y
diff --git a/baseconfig/x86/CONFIG_IOSF_MBI_DEBUG b/baseconfig/x86/CONFIG_IOSF_MBI_DEBUG
deleted file mode 100644
index ecc6275ab..000000000
--- a/baseconfig/x86/CONFIG_IOSF_MBI_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IOSF_MBI_DEBUG is not set
diff --git a/baseconfig/x86/CONFIG_IPW2100 b/baseconfig/x86/CONFIG_IPW2100
deleted file mode 100644
index 7cd6b8097..000000000
--- a/baseconfig/x86/CONFIG_IPW2100
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IPW2100=m
diff --git a/baseconfig/x86/CONFIG_IPW2100_MONITOR b/baseconfig/x86/CONFIG_IPW2100_MONITOR
deleted file mode 100644
index d409cd004..000000000
--- a/baseconfig/x86/CONFIG_IPW2100_MONITOR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IPW2100_MONITOR=y
diff --git a/baseconfig/x86/CONFIG_IPW2200 b/baseconfig/x86/CONFIG_IPW2200
deleted file mode 100644
index a1feed659..000000000
--- a/baseconfig/x86/CONFIG_IPW2200
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IPW2200=m
diff --git a/baseconfig/x86/CONFIG_IPW2200_MONITOR b/baseconfig/x86/CONFIG_IPW2200_MONITOR
deleted file mode 100644
index 31bc39b2a..000000000
--- a/baseconfig/x86/CONFIG_IPW2200_MONITOR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IPW2200_MONITOR=y
diff --git a/baseconfig/x86/CONFIG_IPW2200_PROMISCUOUS b/baseconfig/x86/CONFIG_IPW2200_PROMISCUOUS
deleted file mode 100644
index dd9265155..000000000
--- a/baseconfig/x86/CONFIG_IPW2200_PROMISCUOUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IPW2200_PROMISCUOUS=y
diff --git a/baseconfig/x86/CONFIG_IPW2200_QOS b/baseconfig/x86/CONFIG_IPW2200_QOS
deleted file mode 100644
index d67715efc..000000000
--- a/baseconfig/x86/CONFIG_IPW2200_QOS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IPW2200_QOS=y
diff --git a/baseconfig/x86/CONFIG_IPW2200_RADIOTAP b/baseconfig/x86/CONFIG_IPW2200_RADIOTAP
deleted file mode 100644
index e43f7fe00..000000000
--- a/baseconfig/x86/CONFIG_IPW2200_RADIOTAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IPW2200_RADIOTAP=y
diff --git a/baseconfig/x86/CONFIG_IRQ_DOMAIN_DEBUG b/baseconfig/x86/CONFIG_IRQ_DOMAIN_DEBUG
deleted file mode 100644
index fadfd90f4..000000000
--- a/baseconfig/x86/CONFIG_IRQ_DOMAIN_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
diff --git a/baseconfig/x86/CONFIG_ISCSI_IBFT b/baseconfig/x86/CONFIG_ISCSI_IBFT
deleted file mode 100644
index de0808095..000000000
--- a/baseconfig/x86/CONFIG_ISCSI_IBFT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ISCSI_IBFT=m
diff --git a/baseconfig/x86/CONFIG_ISCSI_IBFT_FIND b/baseconfig/x86/CONFIG_ISCSI_IBFT_FIND
deleted file mode 100644
index 4737a1e89..000000000
--- a/baseconfig/x86/CONFIG_ISCSI_IBFT_FIND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ISCSI_IBFT_FIND=y
diff --git a/baseconfig/x86/CONFIG_KEXEC_VERIFY_SIG b/baseconfig/x86/CONFIG_KEXEC_VERIFY_SIG
deleted file mode 100644
index 5d9b84372..000000000
--- a/baseconfig/x86/CONFIG_KEXEC_VERIFY_SIG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_KEXEC_VERIFY_SIG is not set
diff --git a/baseconfig/x86/CONFIG_KEYBOARD_GPIO b/baseconfig/x86/CONFIG_KEYBOARD_GPIO
deleted file mode 100644
index 46a9f62ef..000000000
--- a/baseconfig/x86/CONFIG_KEYBOARD_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEYBOARD_GPIO=m
diff --git a/baseconfig/x86/CONFIG_KVM b/baseconfig/x86/CONFIG_KVM
deleted file mode 100644
index cf9bf67a6..000000000
--- a/baseconfig/x86/CONFIG_KVM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KVM=m
diff --git a/baseconfig/x86/CONFIG_KVM_AMD b/baseconfig/x86/CONFIG_KVM_AMD
deleted file mode 100644
index b96224f70..000000000
--- a/baseconfig/x86/CONFIG_KVM_AMD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KVM_AMD=m
diff --git a/baseconfig/x86/CONFIG_KVM_DEBUG_FS b/baseconfig/x86/CONFIG_KVM_DEBUG_FS
deleted file mode 100644
index 0e9438841..000000000
--- a/baseconfig/x86/CONFIG_KVM_DEBUG_FS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_KVM_DEBUG_FS is not set
diff --git a/baseconfig/x86/CONFIG_KVM_DEVICE_ASSIGNMENT b/baseconfig/x86/CONFIG_KVM_DEVICE_ASSIGNMENT
deleted file mode 100644
index 6879c7b7c..000000000
--- a/baseconfig/x86/CONFIG_KVM_DEVICE_ASSIGNMENT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KVM_DEVICE_ASSIGNMENT=y
diff --git a/baseconfig/x86/CONFIG_KVM_GUEST b/baseconfig/x86/CONFIG_KVM_GUEST
deleted file mode 100644
index 133da0424..000000000
--- a/baseconfig/x86/CONFIG_KVM_GUEST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KVM_GUEST=y
diff --git a/baseconfig/x86/CONFIG_KVM_INTEL b/baseconfig/x86/CONFIG_KVM_INTEL
deleted file mode 100644
index 7f5fa4452..000000000
--- a/baseconfig/x86/CONFIG_KVM_INTEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KVM_INTEL=m
diff --git a/baseconfig/x86/CONFIG_KVM_MMU_AUDIT b/baseconfig/x86/CONFIG_KVM_MMU_AUDIT
deleted file mode 100644
index 7e62e63cd..000000000
--- a/baseconfig/x86/CONFIG_KVM_MMU_AUDIT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KVM_MMU_AUDIT=y
diff --git a/baseconfig/x86/CONFIG_LEDS_INTEL_SS4200 b/baseconfig/x86/CONFIG_LEDS_INTEL_SS4200
deleted file mode 100644
index 9937903af..000000000
--- a/baseconfig/x86/CONFIG_LEDS_INTEL_SS4200
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LEDS_INTEL_SS4200=m
diff --git a/baseconfig/x86/CONFIG_LGUEST b/baseconfig/x86/CONFIG_LGUEST
deleted file mode 100644
index b80e4b9a3..000000000
--- a/baseconfig/x86/CONFIG_LGUEST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LGUEST=m
diff --git a/baseconfig/x86/CONFIG_LGUEST_GUEST b/baseconfig/x86/CONFIG_LGUEST_GUEST
deleted file mode 100644
index 92e126f36..000000000
--- a/baseconfig/x86/CONFIG_LGUEST_GUEST
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_LGUEST_GUEST is not set
diff --git a/baseconfig/x86/CONFIG_LOAD_UEFI_KEYS b/baseconfig/x86/CONFIG_LOAD_UEFI_KEYS
deleted file mode 100644
index 22502e981..000000000
--- a/baseconfig/x86/CONFIG_LOAD_UEFI_KEYS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LOAD_UEFI_KEYS=y
diff --git a/baseconfig/x86/CONFIG_LOCK_DOWN_KERNEL b/baseconfig/x86/CONFIG_LOCK_DOWN_KERNEL
deleted file mode 100644
index e99bff22d..000000000
--- a/baseconfig/x86/CONFIG_LOCK_DOWN_KERNEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LOCK_DOWN_KERNEL=y
diff --git a/baseconfig/x86/CONFIG_LPC_ICH b/baseconfig/x86/CONFIG_LPC_ICH
deleted file mode 100644
index 0348d015e..000000000
--- a/baseconfig/x86/CONFIG_LPC_ICH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LPC_ICH=m
diff --git a/baseconfig/x86/CONFIG_LPC_SCH b/baseconfig/x86/CONFIG_LPC_SCH
deleted file mode 100644
index 5d8664a8a..000000000
--- a/baseconfig/x86/CONFIG_LPC_SCH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LPC_SCH=m
diff --git a/baseconfig/x86/CONFIG_MACINTOSH_DRIVERS b/baseconfig/x86/CONFIG_MACINTOSH_DRIVERS
deleted file mode 100644
index 105442f40..000000000
--- a/baseconfig/x86/CONFIG_MACINTOSH_DRIVERS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MACINTOSH_DRIVERS=y
diff --git a/baseconfig/x86/CONFIG_MAXSMP b/baseconfig/x86/CONFIG_MAXSMP
deleted file mode 100644
index d0d71de53..000000000
--- a/baseconfig/x86/CONFIG_MAXSMP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MAXSMP is not set
diff --git a/baseconfig/x86/CONFIG_MEMTEST b/baseconfig/x86/CONFIG_MEMTEST
deleted file mode 100644
index 27d7daee6..000000000
--- a/baseconfig/x86/CONFIG_MEMTEST
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MEMTEST is not set
diff --git a/baseconfig/x86/CONFIG_MFD_88PM800 b/baseconfig/x86/CONFIG_MFD_88PM800
deleted file mode 100644
index 858dc2db1..000000000
--- a/baseconfig/x86/CONFIG_MFD_88PM800
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_88PM800 is not set
diff --git a/baseconfig/x86/CONFIG_MFD_88PM805 b/baseconfig/x86/CONFIG_MFD_88PM805
deleted file mode 100644
index f3cd46c90..000000000
--- a/baseconfig/x86/CONFIG_MFD_88PM805
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_88PM805 is not set
diff --git a/baseconfig/x86/CONFIG_MFD_AAT2870_CORE b/baseconfig/x86/CONFIG_MFD_AAT2870_CORE
deleted file mode 100644
index 9d4cf9056..000000000
--- a/baseconfig/x86/CONFIG_MFD_AAT2870_CORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_AAT2870_CORE is not set
diff --git a/baseconfig/x86/CONFIG_MFD_AS3711 b/baseconfig/x86/CONFIG_MFD_AS3711
deleted file mode 100644
index 53b3b04f1..000000000
--- a/baseconfig/x86/CONFIG_MFD_AS3711
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_AS3711 is not set
diff --git a/baseconfig/x86/CONFIG_MFD_DA9052_I2C b/baseconfig/x86/CONFIG_MFD_DA9052_I2C
deleted file mode 100644
index c294bc24d..000000000
--- a/baseconfig/x86/CONFIG_MFD_DA9052_I2C
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_DA9052_I2C is not set
diff --git a/baseconfig/x86/CONFIG_MFD_DA9055 b/baseconfig/x86/CONFIG_MFD_DA9055
deleted file mode 100644
index 3f7ae6423..000000000
--- a/baseconfig/x86/CONFIG_MFD_DA9055
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_DA9055 is not set
diff --git a/baseconfig/x86/CONFIG_MFD_INTEL_LPSS_ACPI b/baseconfig/x86/CONFIG_MFD_INTEL_LPSS_ACPI
deleted file mode 100644
index 7be3065fc..000000000
--- a/baseconfig/x86/CONFIG_MFD_INTEL_LPSS_ACPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_INTEL_LPSS_ACPI=m
diff --git a/baseconfig/x86/CONFIG_MFD_INTEL_LPSS_PCI b/baseconfig/x86/CONFIG_MFD_INTEL_LPSS_PCI
deleted file mode 100644
index 93a430846..000000000
--- a/baseconfig/x86/CONFIG_MFD_INTEL_LPSS_PCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_INTEL_LPSS_PCI=m
diff --git a/baseconfig/x86/CONFIG_MFD_INTEL_QUARK_I2C_GPIO b/baseconfig/x86/CONFIG_MFD_INTEL_QUARK_I2C_GPIO
deleted file mode 100644
index e0e51d577..000000000
--- a/baseconfig/x86/CONFIG_MFD_INTEL_QUARK_I2C_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
diff --git a/baseconfig/x86/CONFIG_MFD_LP8788 b/baseconfig/x86/CONFIG_MFD_LP8788
deleted file mode 100644
index 4600a154f..000000000
--- a/baseconfig/x86/CONFIG_MFD_LP8788
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_LP8788 is not set
diff --git a/baseconfig/x86/CONFIG_MFD_RC5T583 b/baseconfig/x86/CONFIG_MFD_RC5T583
deleted file mode 100644
index f3976be09..000000000
--- a/baseconfig/x86/CONFIG_MFD_RC5T583
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_RC5T583 is not set
diff --git a/baseconfig/x86/CONFIG_MFD_SEC_CORE b/baseconfig/x86/CONFIG_MFD_SEC_CORE
deleted file mode 100644
index d6bc4de4d..000000000
--- a/baseconfig/x86/CONFIG_MFD_SEC_CORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_SEC_CORE is not set
diff --git a/baseconfig/x86/CONFIG_MFD_SMSC b/baseconfig/x86/CONFIG_MFD_SMSC
deleted file mode 100644
index 998701017..000000000
--- a/baseconfig/x86/CONFIG_MFD_SMSC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_SMSC is not set
diff --git a/baseconfig/x86/CONFIG_MFD_TPS6586X b/baseconfig/x86/CONFIG_MFD_TPS6586X
deleted file mode 100644
index 142ccf9dd..000000000
--- a/baseconfig/x86/CONFIG_MFD_TPS6586X
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_TPS6586X is not set
diff --git a/baseconfig/x86/CONFIG_MICROCODE b/baseconfig/x86/CONFIG_MICROCODE
deleted file mode 100644
index bbf6abac4..000000000
--- a/baseconfig/x86/CONFIG_MICROCODE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MICROCODE=y
diff --git a/baseconfig/x86/CONFIG_MICROCODE_AMD b/baseconfig/x86/CONFIG_MICROCODE_AMD
deleted file mode 100644
index 73f45c40e..000000000
--- a/baseconfig/x86/CONFIG_MICROCODE_AMD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MICROCODE_AMD=y
diff --git a/baseconfig/x86/CONFIG_MICROCODE_INTEL b/baseconfig/x86/CONFIG_MICROCODE_INTEL
deleted file mode 100644
index 11709e556..000000000
--- a/baseconfig/x86/CONFIG_MICROCODE_INTEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MICROCODE_INTEL=y
diff --git a/baseconfig/x86/CONFIG_MMC_TOSHIBA_PCI b/baseconfig/x86/CONFIG_MMC_TOSHIBA_PCI
deleted file mode 100644
index 9372cd4fe..000000000
--- a/baseconfig/x86/CONFIG_MMC_TOSHIBA_PCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MMC_TOSHIBA_PCI=m
diff --git a/baseconfig/x86/CONFIG_MMIOTRACE b/baseconfig/x86/CONFIG_MMIOTRACE
deleted file mode 100644
index dd8016c2c..000000000
--- a/baseconfig/x86/CONFIG_MMIOTRACE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MMIOTRACE=y
diff --git a/baseconfig/x86/CONFIG_MMIOTRACE_TEST b/baseconfig/x86/CONFIG_MMIOTRACE_TEST
deleted file mode 100644
index d8bbc0bdd..000000000
--- a/baseconfig/x86/CONFIG_MMIOTRACE_TEST
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MMIOTRACE_TEST is not set
diff --git a/baseconfig/x86/CONFIG_MOUSE_PS2_VMMOUSE b/baseconfig/x86/CONFIG_MOUSE_PS2_VMMOUSE
deleted file mode 100644
index d3f895d3b..000000000
--- a/baseconfig/x86/CONFIG_MOUSE_PS2_VMMOUSE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MOUSE_PS2_VMMOUSE=y
diff --git a/baseconfig/x86/CONFIG_MPILIB b/baseconfig/x86/CONFIG_MPILIB
deleted file mode 100644
index a41ce5d0e..000000000
--- a/baseconfig/x86/CONFIG_MPILIB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MPILIB=y
diff --git a/baseconfig/x86/CONFIG_MSI_LAPTOP b/baseconfig/x86/CONFIG_MSI_LAPTOP
deleted file mode 100644
index 7d45b2e5e..000000000
--- a/baseconfig/x86/CONFIG_MSI_LAPTOP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MSI_LAPTOP=m
diff --git a/baseconfig/x86/CONFIG_MSI_WMI b/baseconfig/x86/CONFIG_MSI_WMI
deleted file mode 100644
index 7949ac91b..000000000
--- a/baseconfig/x86/CONFIG_MSI_WMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MSI_WMI=m
diff --git a/baseconfig/x86/CONFIG_MTD_CK804XROM b/baseconfig/x86/CONFIG_MTD_CK804XROM
deleted file mode 100644
index 197c6ed96..000000000
--- a/baseconfig/x86/CONFIG_MTD_CK804XROM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_CK804XROM=m
diff --git a/baseconfig/x86/CONFIG_MTD_ESB2ROM b/baseconfig/x86/CONFIG_MTD_ESB2ROM
deleted file mode 100644
index 4398f4a1e..000000000
--- a/baseconfig/x86/CONFIG_MTD_ESB2ROM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_ESB2ROM=m
diff --git a/baseconfig/x86/CONFIG_MTRR b/baseconfig/x86/CONFIG_MTRR
deleted file mode 100644
index 744162bca..000000000
--- a/baseconfig/x86/CONFIG_MTRR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTRR=y
diff --git a/baseconfig/x86/CONFIG_MTRR_SANITIZER b/baseconfig/x86/CONFIG_MTRR_SANITIZER
deleted file mode 100644
index 2a32885dd..000000000
--- a/baseconfig/x86/CONFIG_MTRR_SANITIZER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTRR_SANITIZER=y
diff --git a/baseconfig/x86/CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT b/baseconfig/x86/CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT
deleted file mode 100644
index 904e30638..000000000
--- a/baseconfig/x86/CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
diff --git a/baseconfig/x86/CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT b/baseconfig/x86/CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT
deleted file mode 100644
index f400e9c44..000000000
--- a/baseconfig/x86/CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
diff --git a/baseconfig/x86/CONFIG_NET_SB1000 b/baseconfig/x86/CONFIG_NET_SB1000
deleted file mode 100644
index c776a1581..000000000
--- a/baseconfig/x86/CONFIG_NET_SB1000
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_SB1000 is not set
diff --git a/baseconfig/x86/CONFIG_NET_VENDOR_SOLARFLARE b/baseconfig/x86/CONFIG_NET_VENDOR_SOLARFLARE
deleted file mode 100644
index 8b1f0b6bf..000000000
--- a/baseconfig/x86/CONFIG_NET_VENDOR_SOLARFLARE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NET_VENDOR_SOLARFLARE=y
diff --git a/baseconfig/x86/CONFIG_NFC_MEI_PHY b/baseconfig/x86/CONFIG_NFC_MEI_PHY
deleted file mode 100644
index c71b82e3a..000000000
--- a/baseconfig/x86/CONFIG_NFC_MEI_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NFC_MEI_PHY=m
diff --git a/baseconfig/x86/CONFIG_NFC_MICROREAD_MEI b/baseconfig/x86/CONFIG_NFC_MICROREAD_MEI
deleted file mode 100644
index 6f92f1400..000000000
--- a/baseconfig/x86/CONFIG_NFC_MICROREAD_MEI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NFC_MICROREAD_MEI=m
diff --git a/baseconfig/x86/CONFIG_NFC_PN544_MEI b/baseconfig/x86/CONFIG_NFC_PN544_MEI
deleted file mode 100644
index a94f0ad1b..000000000
--- a/baseconfig/x86/CONFIG_NFC_PN544_MEI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NFC_PN544_MEI=m
diff --git a/baseconfig/x86/CONFIG_NIC7018_WDT b/baseconfig/x86/CONFIG_NIC7018_WDT
deleted file mode 100644
index 9bc7a462a..000000000
--- a/baseconfig/x86/CONFIG_NIC7018_WDT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NIC7018_WDT=m
diff --git a/baseconfig/x86/CONFIG_NO_BOOTMEM b/baseconfig/x86/CONFIG_NO_BOOTMEM
deleted file mode 100644
index 42f85aa30..000000000
--- a/baseconfig/x86/CONFIG_NO_BOOTMEM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NO_BOOTMEM=y
diff --git a/baseconfig/x86/CONFIG_NVRAM b/baseconfig/x86/CONFIG_NVRAM
deleted file mode 100644
index a296f9134..000000000
--- a/baseconfig/x86/CONFIG_NVRAM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NVRAM=y
diff --git a/baseconfig/x86/CONFIG_NV_TCO b/baseconfig/x86/CONFIG_NV_TCO
deleted file mode 100644
index 984c1ff65..000000000
--- a/baseconfig/x86/CONFIG_NV_TCO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NV_TCO=m
diff --git a/baseconfig/x86/CONFIG_PANASONIC_LAPTOP b/baseconfig/x86/CONFIG_PANASONIC_LAPTOP
deleted file mode 100644
index f1ac44b84..000000000
--- a/baseconfig/x86/CONFIG_PANASONIC_LAPTOP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PANASONIC_LAPTOP=m
diff --git a/baseconfig/x86/CONFIG_PARAVIRT b/baseconfig/x86/CONFIG_PARAVIRT
deleted file mode 100644
index 65d95d1e2..000000000
--- a/baseconfig/x86/CONFIG_PARAVIRT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PARAVIRT=y
diff --git a/baseconfig/x86/CONFIG_PARAVIRT_DEBUG b/baseconfig/x86/CONFIG_PARAVIRT_DEBUG
deleted file mode 100644
index 7b0071250..000000000
--- a/baseconfig/x86/CONFIG_PARAVIRT_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PARAVIRT_DEBUG is not set
diff --git a/baseconfig/x86/CONFIG_PARAVIRT_SPINLOCKS b/baseconfig/x86/CONFIG_PARAVIRT_SPINLOCKS
deleted file mode 100644
index 857e9465e..000000000
--- a/baseconfig/x86/CONFIG_PARAVIRT_SPINLOCKS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PARAVIRT_SPINLOCKS is not set
diff --git a/baseconfig/x86/CONFIG_PARAVIRT_TIME_ACCOUNTING b/baseconfig/x86/CONFIG_PARAVIRT_TIME_ACCOUNTING
deleted file mode 100644
index 176320ad5..000000000
--- a/baseconfig/x86/CONFIG_PARAVIRT_TIME_ACCOUNTING
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
diff --git a/baseconfig/x86/CONFIG_PARPORT b/baseconfig/x86/CONFIG_PARPORT
deleted file mode 100644
index 589156958..000000000
--- a/baseconfig/x86/CONFIG_PARPORT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PARPORT=m
diff --git a/baseconfig/x86/CONFIG_PARPORT_1284 b/baseconfig/x86/CONFIG_PARPORT_1284
deleted file mode 100644
index 585684fb0..000000000
--- a/baseconfig/x86/CONFIG_PARPORT_1284
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PARPORT_1284=y
diff --git a/baseconfig/x86/CONFIG_PARPORT_AX88796 b/baseconfig/x86/CONFIG_PARPORT_AX88796
deleted file mode 100644
index 6214b2b8c..000000000
--- a/baseconfig/x86/CONFIG_PARPORT_AX88796
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PARPORT_AX88796 is not set
diff --git a/baseconfig/x86/CONFIG_PARPORT_PC b/baseconfig/x86/CONFIG_PARPORT_PC
deleted file mode 100644
index b9aa6e8ca..000000000
--- a/baseconfig/x86/CONFIG_PARPORT_PC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PARPORT_PC=m
diff --git a/baseconfig/x86/CONFIG_PARPORT_PC_FIFO b/baseconfig/x86/CONFIG_PARPORT_PC_FIFO
deleted file mode 100644
index 62562af4c..000000000
--- a/baseconfig/x86/CONFIG_PARPORT_PC_FIFO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PARPORT_PC_FIFO is not set
diff --git a/baseconfig/x86/CONFIG_PARPORT_PC_PCMCIA b/baseconfig/x86/CONFIG_PARPORT_PC_PCMCIA
deleted file mode 100644
index cae4b9a2a..000000000
--- a/baseconfig/x86/CONFIG_PARPORT_PC_PCMCIA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PARPORT_PC_PCMCIA=m
diff --git a/baseconfig/x86/CONFIG_PARPORT_PC_SUPERIO b/baseconfig/x86/CONFIG_PARPORT_PC_SUPERIO
deleted file mode 100644
index b6858ce79..000000000
--- a/baseconfig/x86/CONFIG_PARPORT_PC_SUPERIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PARPORT_PC_SUPERIO is not set
diff --git a/baseconfig/x86/CONFIG_PARPORT_SERIAL b/baseconfig/x86/CONFIG_PARPORT_SERIAL
deleted file mode 100644
index 8e9020190..000000000
--- a/baseconfig/x86/CONFIG_PARPORT_SERIAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PARPORT_SERIAL=m
diff --git a/baseconfig/x86/CONFIG_PATA_ACPI b/baseconfig/x86/CONFIG_PATA_ACPI
deleted file mode 100644
index c3bc7866f..000000000
--- a/baseconfig/x86/CONFIG_PATA_ACPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PATA_ACPI=m
diff --git a/baseconfig/x86/CONFIG_PATA_ATIIXP b/baseconfig/x86/CONFIG_PATA_ATIIXP
deleted file mode 100644
index 0089d45c9..000000000
--- a/baseconfig/x86/CONFIG_PATA_ATIIXP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PATA_ATIIXP=m
diff --git a/baseconfig/x86/CONFIG_PATA_MPIIX b/baseconfig/x86/CONFIG_PATA_MPIIX
deleted file mode 100644
index a29c081f6..000000000
--- a/baseconfig/x86/CONFIG_PATA_MPIIX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PATA_MPIIX=m
diff --git a/baseconfig/x86/CONFIG_PATA_OLDPIIX b/baseconfig/x86/CONFIG_PATA_OLDPIIX
deleted file mode 100644
index a3a6f6f6f..000000000
--- a/baseconfig/x86/CONFIG_PATA_OLDPIIX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PATA_OLDPIIX=m
diff --git a/baseconfig/x86/CONFIG_PATA_SCH b/baseconfig/x86/CONFIG_PATA_SCH
deleted file mode 100644
index 2b0924997..000000000
--- a/baseconfig/x86/CONFIG_PATA_SCH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PATA_SCH=m
diff --git a/baseconfig/x86/CONFIG_PATA_TOSHIBA b/baseconfig/x86/CONFIG_PATA_TOSHIBA
deleted file mode 100644
index 1fe4524d6..000000000
--- a/baseconfig/x86/CONFIG_PATA_TOSHIBA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PATA_TOSHIBA=m
diff --git a/baseconfig/x86/CONFIG_PATA_TRIFLEX b/baseconfig/x86/CONFIG_PATA_TRIFLEX
deleted file mode 100644
index 09a247f65..000000000
--- a/baseconfig/x86/CONFIG_PATA_TRIFLEX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PATA_TRIFLEX=m
diff --git a/baseconfig/x86/CONFIG_PCH_CAN b/baseconfig/x86/CONFIG_PCH_CAN
deleted file mode 100644
index 0350f86bd..000000000
--- a/baseconfig/x86/CONFIG_PCH_CAN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCH_CAN=m
diff --git a/baseconfig/x86/CONFIG_PCH_DMA b/baseconfig/x86/CONFIG_PCH_DMA
deleted file mode 100644
index 45a18788d..000000000
--- a/baseconfig/x86/CONFIG_PCH_DMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCH_DMA=m
diff --git a/baseconfig/x86/CONFIG_PCH_GBE b/baseconfig/x86/CONFIG_PCH_GBE
deleted file mode 100644
index 0ca9f51a0..000000000
--- a/baseconfig/x86/CONFIG_PCH_GBE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCH_GBE=m
diff --git a/baseconfig/x86/CONFIG_PCH_PHUB b/baseconfig/x86/CONFIG_PCH_PHUB
deleted file mode 100644
index 3479f3e68..000000000
--- a/baseconfig/x86/CONFIG_PCH_PHUB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCH_PHUB=m
diff --git a/baseconfig/x86/CONFIG_PCI_BIOS b/baseconfig/x86/CONFIG_PCI_BIOS
deleted file mode 100644
index 982fc1fa1..000000000
--- a/baseconfig/x86/CONFIG_PCI_BIOS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCI_BIOS=y
diff --git a/baseconfig/x86/CONFIG_PCI_CNB20LE_QUIRK b/baseconfig/x86/CONFIG_PCI_CNB20LE_QUIRK
deleted file mode 100644
index 88876bd15..000000000
--- a/baseconfig/x86/CONFIG_PCI_CNB20LE_QUIRK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCI_CNB20LE_QUIRK=y
diff --git a/baseconfig/x86/CONFIG_PCI_HYPERV b/baseconfig/x86/CONFIG_PCI_HYPERV
deleted file mode 100644
index baf87f9b9..000000000
--- a/baseconfig/x86/CONFIG_PCI_HYPERV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCI_HYPERV=m
diff --git a/baseconfig/x86/CONFIG_PCI_MMCONFIG b/baseconfig/x86/CONFIG_PCI_MMCONFIG
deleted file mode 100644
index cd749582c..000000000
--- a/baseconfig/x86/CONFIG_PCI_MMCONFIG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCI_MMCONFIG=y
diff --git a/baseconfig/x86/CONFIG_PEAQ_WMI b/baseconfig/x86/CONFIG_PEAQ_WMI
deleted file mode 100644
index 942e0690e..000000000
--- a/baseconfig/x86/CONFIG_PEAQ_WMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PEAQ_WMI=m
diff --git a/baseconfig/x86/CONFIG_PERF_EVENTS_AMD_POWER b/baseconfig/x86/CONFIG_PERF_EVENTS_AMD_POWER
deleted file mode 100644
index 481bdca29..000000000
--- a/baseconfig/x86/CONFIG_PERF_EVENTS_AMD_POWER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PERF_EVENTS_AMD_POWER=m
diff --git a/baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_CSTATE b/baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_CSTATE
deleted file mode 100644
index aca4e0481..000000000
--- a/baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_CSTATE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PERF_EVENTS_INTEL_CSTATE=m
diff --git a/baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_RAPL b/baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_RAPL
deleted file mode 100644
index b4c5123f1..000000000
--- a/baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_RAPL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PERF_EVENTS_INTEL_RAPL=m
diff --git a/baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_UNCORE b/baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_UNCORE
deleted file mode 100644
index c96e92f02..000000000
--- a/baseconfig/x86/CONFIG_PERF_EVENTS_INTEL_UNCORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PERF_EVENTS_INTEL_UNCORE=m
diff --git a/baseconfig/x86/CONFIG_PINCTRL b/baseconfig/x86/CONFIG_PINCTRL
deleted file mode 100644
index d8d83d561..000000000
--- a/baseconfig/x86/CONFIG_PINCTRL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL=y
diff --git a/baseconfig/x86/CONFIG_PINCTRL_AMD b/baseconfig/x86/CONFIG_PINCTRL_AMD
deleted file mode 100644
index 02626b835..000000000
--- a/baseconfig/x86/CONFIG_PINCTRL_AMD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PINCTRL_AMD is not set
diff --git a/baseconfig/x86/CONFIG_PINCTRL_BAYTRAIL b/baseconfig/x86/CONFIG_PINCTRL_BAYTRAIL
deleted file mode 100644
index 706680265..000000000
--- a/baseconfig/x86/CONFIG_PINCTRL_BAYTRAIL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_BAYTRAIL=y
diff --git a/baseconfig/x86/CONFIG_PINCTRL_BROXTON b/baseconfig/x86/CONFIG_PINCTRL_BROXTON
deleted file mode 100644
index 563eb973f..000000000
--- a/baseconfig/x86/CONFIG_PINCTRL_BROXTON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_BROXTON=m
diff --git a/baseconfig/x86/CONFIG_PINCTRL_CHERRYVIEW b/baseconfig/x86/CONFIG_PINCTRL_CHERRYVIEW
deleted file mode 100644
index bcdf61e7d..000000000
--- a/baseconfig/x86/CONFIG_PINCTRL_CHERRYVIEW
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_CHERRYVIEW=y
diff --git a/baseconfig/x86/CONFIG_PINCTRL_DENVERTON b/baseconfig/x86/CONFIG_PINCTRL_DENVERTON
deleted file mode 100644
index ec6b4e8e1..000000000
--- a/baseconfig/x86/CONFIG_PINCTRL_DENVERTON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_DENVERTON=m
diff --git a/baseconfig/x86/CONFIG_PINCTRL_GEMINILAKE b/baseconfig/x86/CONFIG_PINCTRL_GEMINILAKE
deleted file mode 100644
index deb3b301d..000000000
--- a/baseconfig/x86/CONFIG_PINCTRL_GEMINILAKE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PINCTRL_GEMINILAKE is not set
diff --git a/baseconfig/x86/CONFIG_PINCTRL_SUNRISEPOINT b/baseconfig/x86/CONFIG_PINCTRL_SUNRISEPOINT
deleted file mode 100644
index f47b9a76d..000000000
--- a/baseconfig/x86/CONFIG_PINCTRL_SUNRISEPOINT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_SUNRISEPOINT=m
diff --git a/baseconfig/x86/CONFIG_PMIC_ADP5520 b/baseconfig/x86/CONFIG_PMIC_ADP5520
deleted file mode 100644
index 8664194c8..000000000
--- a/baseconfig/x86/CONFIG_PMIC_ADP5520
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PMIC_ADP5520 is not set
diff --git a/baseconfig/x86/CONFIG_PMIC_DA903X b/baseconfig/x86/CONFIG_PMIC_DA903X
deleted file mode 100644
index 875cd2580..000000000
--- a/baseconfig/x86/CONFIG_PMIC_DA903X
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PMIC_DA903X is not set
diff --git a/baseconfig/x86/CONFIG_PMIC_OPREGION b/baseconfig/x86/CONFIG_PMIC_OPREGION
deleted file mode 100644
index 4dbdfac30..000000000
--- a/baseconfig/x86/CONFIG_PMIC_OPREGION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PMIC_OPREGION=y
diff --git a/baseconfig/x86/CONFIG_PNP b/baseconfig/x86/CONFIG_PNP
deleted file mode 100644
index 5c70e41cd..000000000
--- a/baseconfig/x86/CONFIG_PNP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PNP=y
diff --git a/baseconfig/x86/CONFIG_PNPACPI b/baseconfig/x86/CONFIG_PNPACPI
deleted file mode 100644
index 02d6f696e..000000000
--- a/baseconfig/x86/CONFIG_PNPACPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PNPACPI=y
diff --git a/baseconfig/x86/CONFIG_PNP_DEBUG_MESSAGES b/baseconfig/x86/CONFIG_PNP_DEBUG_MESSAGES
deleted file mode 100644
index cb591885f..000000000
--- a/baseconfig/x86/CONFIG_PNP_DEBUG_MESSAGES
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PNP_DEBUG_MESSAGES is not set
diff --git a/baseconfig/x86/CONFIG_PPS_CLIENT_PARPORT b/baseconfig/x86/CONFIG_PPS_CLIENT_PARPORT
deleted file mode 100644
index d11894def..000000000
--- a/baseconfig/x86/CONFIG_PPS_CLIENT_PARPORT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PPS_CLIENT_PARPORT=m
diff --git a/baseconfig/x86/CONFIG_PROC_VMCORE b/baseconfig/x86/CONFIG_PROC_VMCORE
deleted file mode 100644
index c864e6b0b..000000000
--- a/baseconfig/x86/CONFIG_PROC_VMCORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PROC_VMCORE=y
diff --git a/baseconfig/x86/CONFIG_PTP_1588_CLOCK_KVM b/baseconfig/x86/CONFIG_PTP_1588_CLOCK_KVM
deleted file mode 100644
index 203f6b757..000000000
--- a/baseconfig/x86/CONFIG_PTP_1588_CLOCK_KVM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PTP_1588_CLOCK_KVM=m
diff --git a/baseconfig/x86/CONFIG_PUNIT_ATOM_DEBUG b/baseconfig/x86/CONFIG_PUNIT_ATOM_DEBUG
deleted file mode 100644
index 0507cd497..000000000
--- a/baseconfig/x86/CONFIG_PUNIT_ATOM_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PUNIT_ATOM_DEBUG is not set
diff --git a/baseconfig/x86/CONFIG_PVPANIC b/baseconfig/x86/CONFIG_PVPANIC
deleted file mode 100644
index fdc38a0f2..000000000
--- a/baseconfig/x86/CONFIG_PVPANIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PVPANIC=m
diff --git a/baseconfig/x86/CONFIG_PWM_CRC b/baseconfig/x86/CONFIG_PWM_CRC
deleted file mode 100644
index 9b76aad38..000000000
--- a/baseconfig/x86/CONFIG_PWM_CRC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PWM_CRC=y
diff --git a/baseconfig/x86/CONFIG_PWM_LPSS b/baseconfig/x86/CONFIG_PWM_LPSS
deleted file mode 100644
index 7e6a48990..000000000
--- a/baseconfig/x86/CONFIG_PWM_LPSS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PWM_LPSS=m
diff --git a/baseconfig/x86/CONFIG_PWM_LPSS_PCI b/baseconfig/x86/CONFIG_PWM_LPSS_PCI
deleted file mode 100644
index d7ed9139e..000000000
--- a/baseconfig/x86/CONFIG_PWM_LPSS_PCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PWM_LPSS_PCI=m
diff --git a/baseconfig/x86/CONFIG_PWM_LPSS_PLATFORM b/baseconfig/x86/CONFIG_PWM_LPSS_PLATFORM
deleted file mode 100644
index d9042d8b8..000000000
--- a/baseconfig/x86/CONFIG_PWM_LPSS_PLATFORM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PWM_LPSS_PLATFORM=m
diff --git a/baseconfig/x86/CONFIG_RANDOMIZE_BASE b/baseconfig/x86/CONFIG_RANDOMIZE_BASE
deleted file mode 100644
index 20610a95a..000000000
--- a/baseconfig/x86/CONFIG_RANDOMIZE_BASE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RANDOMIZE_BASE=y
diff --git a/baseconfig/x86/CONFIG_RAPIDIO b/baseconfig/x86/CONFIG_RAPIDIO
deleted file mode 100644
index 79892b190..000000000
--- a/baseconfig/x86/CONFIG_RAPIDIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_RAPIDIO is not set
diff --git a/baseconfig/x86/CONFIG_RCU_FANOUT_LEAF b/baseconfig/x86/CONFIG_RCU_FANOUT_LEAF
deleted file mode 100644
index 147351a49..000000000
--- a/baseconfig/x86/CONFIG_RCU_FANOUT_LEAF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RCU_FANOUT_LEAF=16
diff --git a/baseconfig/x86/CONFIG_REGMAP_I2C b/baseconfig/x86/CONFIG_REGMAP_I2C
deleted file mode 100644
index 907c212ef..000000000
--- a/baseconfig/x86/CONFIG_REGMAP_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGMAP_I2C=y
diff --git a/baseconfig/x86/CONFIG_RELOCATABLE b/baseconfig/x86/CONFIG_RELOCATABLE
deleted file mode 100644
index 36808edb3..000000000
--- a/baseconfig/x86/CONFIG_RELOCATABLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RELOCATABLE=y
diff --git a/baseconfig/x86/CONFIG_SAMSUNG_LAPTOP b/baseconfig/x86/CONFIG_SAMSUNG_LAPTOP
deleted file mode 100644
index aaa107689..000000000
--- a/baseconfig/x86/CONFIG_SAMSUNG_LAPTOP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SAMSUNG_LAPTOP=m
diff --git a/baseconfig/x86/CONFIG_SAMSUNG_Q10 b/baseconfig/x86/CONFIG_SAMSUNG_Q10
deleted file mode 100644
index 01423b93d..000000000
--- a/baseconfig/x86/CONFIG_SAMSUNG_Q10
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SAMSUNG_Q10=m
diff --git a/baseconfig/x86/CONFIG_SBC_FITPC2_WATCHDOG b/baseconfig/x86/CONFIG_SBC_FITPC2_WATCHDOG
deleted file mode 100644
index 7f3cf3733..000000000
--- a/baseconfig/x86/CONFIG_SBC_FITPC2_WATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SBC_FITPC2_WATCHDOG=m
diff --git a/baseconfig/x86/CONFIG_SCHED_MC b/baseconfig/x86/CONFIG_SCHED_MC
deleted file mode 100644
index 348674403..000000000
--- a/baseconfig/x86/CONFIG_SCHED_MC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCHED_MC=y
diff --git a/baseconfig/x86/CONFIG_SCHED_MC_PRIO b/baseconfig/x86/CONFIG_SCHED_MC_PRIO
deleted file mode 100644
index 893581e34..000000000
--- a/baseconfig/x86/CONFIG_SCHED_MC_PRIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCHED_MC_PRIO=y
diff --git a/baseconfig/x86/CONFIG_SCHED_SMT b/baseconfig/x86/CONFIG_SCHED_SMT
deleted file mode 100644
index ed3f04a20..000000000
--- a/baseconfig/x86/CONFIG_SCHED_SMT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCHED_SMT=y
diff --git a/baseconfig/x86/CONFIG_SCSI_ADVANSYS b/baseconfig/x86/CONFIG_SCSI_ADVANSYS
deleted file mode 100644
index ccae4c427..000000000
--- a/baseconfig/x86/CONFIG_SCSI_ADVANSYS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCSI_ADVANSYS=m
diff --git a/baseconfig/x86/CONFIG_SENSORS_ABITUGURU b/baseconfig/x86/CONFIG_SENSORS_ABITUGURU
deleted file mode 100644
index adab26252..000000000
--- a/baseconfig/x86/CONFIG_SENSORS_ABITUGURU
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_ABITUGURU=m
diff --git a/baseconfig/x86/CONFIG_SENSORS_ABITUGURU3 b/baseconfig/x86/CONFIG_SENSORS_ABITUGURU3
deleted file mode 100644
index 22666cbee..000000000
--- a/baseconfig/x86/CONFIG_SENSORS_ABITUGURU3
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_ABITUGURU3=m
diff --git a/baseconfig/x86/CONFIG_SENSORS_ACPI_POWER b/baseconfig/x86/CONFIG_SENSORS_ACPI_POWER
deleted file mode 100644
index dbb45c01b..000000000
--- a/baseconfig/x86/CONFIG_SENSORS_ACPI_POWER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_ACPI_POWER=m
diff --git a/baseconfig/x86/CONFIG_SENSORS_APPLESMC=m b/baseconfig/x86/CONFIG_SENSORS_APPLESMC=m
deleted file mode 100644
index 48519f04f..000000000
--- a/baseconfig/x86/CONFIG_SENSORS_APPLESMC=m
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_APPLESMC=m
diff --git a/baseconfig/x86/CONFIG_SENSORS_ASB100 b/baseconfig/x86/CONFIG_SENSORS_ASB100
deleted file mode 100644
index e568b0eb6..000000000
--- a/baseconfig/x86/CONFIG_SENSORS_ASB100
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_ASB100=m
diff --git a/baseconfig/x86/CONFIG_SENSORS_ATK0110 b/baseconfig/x86/CONFIG_SENSORS_ATK0110
deleted file mode 100644
index a323de026..000000000
--- a/baseconfig/x86/CONFIG_SENSORS_ATK0110
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_ATK0110=m
diff --git a/baseconfig/x86/CONFIG_SENSORS_CORETEMP b/baseconfig/x86/CONFIG_SENSORS_CORETEMP
deleted file mode 100644
index 8fb4868a2..000000000
--- a/baseconfig/x86/CONFIG_SENSORS_CORETEMP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_CORETEMP=m
diff --git a/baseconfig/x86/CONFIG_SENSORS_DELL_SMM b/baseconfig/x86/CONFIG_SENSORS_DELL_SMM
deleted file mode 100644
index d9fa9f5a2..000000000
--- a/baseconfig/x86/CONFIG_SENSORS_DELL_SMM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_DELL_SMM=m
diff --git a/baseconfig/x86/CONFIG_SENSORS_FAM15H_POWER b/baseconfig/x86/CONFIG_SENSORS_FAM15H_POWER
deleted file mode 100644
index 9632b4c8d..000000000
--- a/baseconfig/x86/CONFIG_SENSORS_FAM15H_POWER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_FAM15H_POWER=m
diff --git a/baseconfig/x86/CONFIG_SENSORS_FSCHMD b/baseconfig/x86/CONFIG_SENSORS_FSCHMD
deleted file mode 100644
index 0407bdcd1..000000000
--- a/baseconfig/x86/CONFIG_SENSORS_FSCHMD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_FSCHMD=m
diff --git a/baseconfig/x86/CONFIG_SENSORS_HDAPS b/baseconfig/x86/CONFIG_SENSORS_HDAPS
deleted file mode 100644
index d2dba2ab1..000000000
--- a/baseconfig/x86/CONFIG_SENSORS_HDAPS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_HDAPS=m
diff --git a/baseconfig/x86/CONFIG_SENSORS_I5500 b/baseconfig/x86/CONFIG_SENSORS_I5500
deleted file mode 100644
index d956e09b5..000000000
--- a/baseconfig/x86/CONFIG_SENSORS_I5500
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_I5500=m
diff --git a/baseconfig/x86/CONFIG_SENSORS_I5K_AMB b/baseconfig/x86/CONFIG_SENSORS_I5K_AMB
deleted file mode 100644
index ad6832efb..000000000
--- a/baseconfig/x86/CONFIG_SENSORS_I5K_AMB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_I5K_AMB=m
diff --git a/baseconfig/x86/CONFIG_SENSORS_K10TEMP b/baseconfig/x86/CONFIG_SENSORS_K10TEMP
deleted file mode 100644
index eec8b328a..000000000
--- a/baseconfig/x86/CONFIG_SENSORS_K10TEMP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_K10TEMP=m
diff --git a/baseconfig/x86/CONFIG_SENSORS_K8TEMP b/baseconfig/x86/CONFIG_SENSORS_K8TEMP
deleted file mode 100644
index f690795aa..000000000
--- a/baseconfig/x86/CONFIG_SENSORS_K8TEMP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_K8TEMP=m
diff --git a/baseconfig/x86/CONFIG_SENSORS_VIA_CPUTEMP b/baseconfig/x86/CONFIG_SENSORS_VIA_CPUTEMP
deleted file mode 100644
index f4ca4454a..000000000
--- a/baseconfig/x86/CONFIG_SENSORS_VIA_CPUTEMP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_VIA_CPUTEMP=m
diff --git a/baseconfig/x86/CONFIG_SERIAL_8250_LPSS b/baseconfig/x86/CONFIG_SERIAL_8250_LPSS
deleted file mode 100644
index 9d2401a32..000000000
--- a/baseconfig/x86/CONFIG_SERIAL_8250_LPSS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_8250_LPSS=m
diff --git a/baseconfig/x86/CONFIG_SFI b/baseconfig/x86/CONFIG_SFI
deleted file mode 100644
index 4754983e1..000000000
--- a/baseconfig/x86/CONFIG_SFI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SFI=y
diff --git a/baseconfig/x86/CONFIG_SILEAD_DMI b/baseconfig/x86/CONFIG_SILEAD_DMI
deleted file mode 100644
index 3fd766126..000000000
--- a/baseconfig/x86/CONFIG_SILEAD_DMI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SILEAD_DMI is not set
diff --git a/baseconfig/x86/CONFIG_SMSC37B787_WDT b/baseconfig/x86/CONFIG_SMSC37B787_WDT
deleted file mode 100644
index 5448253d6..000000000
--- a/baseconfig/x86/CONFIG_SMSC37B787_WDT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SMSC37B787_WDT is not set
diff --git a/baseconfig/x86/CONFIG_SND_INTEL8X0 b/baseconfig/x86/CONFIG_SND_INTEL8X0
deleted file mode 100644
index 6d78f08ea..000000000
--- a/baseconfig/x86/CONFIG_SND_INTEL8X0
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_INTEL8X0=m
diff --git a/baseconfig/x86/CONFIG_SND_INTEL8X0M b/baseconfig/x86/CONFIG_SND_INTEL8X0M
deleted file mode 100644
index 24ac6ada4..000000000
--- a/baseconfig/x86/CONFIG_SND_INTEL8X0M
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_INTEL8X0M=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_AC97_CODEC b/baseconfig/x86/CONFIG_SND_SOC_AC97_CODEC
deleted file mode 100644
index f2388a7c0..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_AC97_CODEC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_AC97_CODEC=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_ES8316 b/baseconfig/x86/CONFIG_SND_SOC_ES8316
deleted file mode 100644
index c173cadd5..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_ES8316
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_ES8316=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_ES8328 b/baseconfig/x86/CONFIG_SND_SOC_ES8328
deleted file mode 100644
index 806f698e1..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_ES8328
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_ES8328=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_ES8328_I2C b/baseconfig/x86/CONFIG_SND_SOC_ES8328_I2C
deleted file mode 100644
index 9f90cb7e0..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_ES8328_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_ES8328_I2C=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_ES8328_SPI b/baseconfig/x86/CONFIG_SND_SOC_ES8328_SPI
deleted file mode 100644
index 0eb8f755c..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_ES8328_SPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_ES8328_SPI=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BAYTRAIL b/baseconfig/x86/CONFIG_SND_SOC_INTEL_BAYTRAIL
deleted file mode 100644
index ba58c2418..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BAYTRAIL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_BAYTRAIL=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH
deleted file mode 100644
index 03e370bf9..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BROADWELL_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_BROADWELL_MACH
deleted file mode 100644
index 9ee67687e..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BROADWELL_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
deleted file mode 100644
index dde636feb..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BXT_RT298_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_BXT_RT298_MACH
deleted file mode 100644
index 5779d30ed..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BXT_RT298_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH
deleted file mode 100644
index d825af971..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH
deleted file mode 100644
index 42c1e72f3..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH
deleted file mode 100644
index 0697694f9..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH
deleted file mode 100644
index 33cb51b40..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
deleted file mode 100644
index db07e5fb0..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH
deleted file mode 100644
index a43d37398..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH
deleted file mode 100644
index bf5c613ac..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
deleted file mode 100644
index 5c7c03e25..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH
deleted file mode 100644
index baa40becc..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH
deleted file mode 100644
index c1f779e5d..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_HASWELL_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_HASWELL_MACH
deleted file mode 100644
index 0413d4066..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_HASWELL_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
deleted file mode 100644
index 139a693b5..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
deleted file mode 100644
index 8fccaf1bd..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
deleted file mode 100644
index 15bc39d49..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
deleted file mode 100644
index 5f9b4d152..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_RT286_MACH b/baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_RT286_MACH
deleted file mode 100644
index f903cb3d1..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SKL_RT286_MACH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SST b/baseconfig/x86/CONFIG_SND_SOC_INTEL_SST
deleted file mode 100644
index d93328a53..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_SST=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SST_ACPI b/baseconfig/x86/CONFIG_SND_SOC_INTEL_SST_ACPI
deleted file mode 100644
index bb5dfab11..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_INTEL_SST_ACPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_INTEL_SST_ACPI=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_NAU8540 b/baseconfig/x86/CONFIG_SND_SOC_NAU8540
deleted file mode 100644
index 9862521b0..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_NAU8540
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_NAU8540=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_TS3A227E b/baseconfig/x86/CONFIG_SND_SOC_TS3A227E
deleted file mode 100644
index 1d3522517..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_TS3A227E
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_TS3A227E=m
diff --git a/baseconfig/x86/CONFIG_SND_VIA82XX b/baseconfig/x86/CONFIG_SND_VIA82XX
deleted file mode 100644
index 129cf3976..000000000
--- a/baseconfig/x86/CONFIG_SND_VIA82XX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_VIA82XX=m
diff --git a/baseconfig/x86/CONFIG_SND_VIA82XX_MODEM b/baseconfig/x86/CONFIG_SND_VIA82XX_MODEM
deleted file mode 100644
index 81e80f3a5..000000000
--- a/baseconfig/x86/CONFIG_SND_VIA82XX_MODEM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_VIA82XX_MODEM=m
diff --git a/baseconfig/x86/CONFIG_SND_X86 b/baseconfig/x86/CONFIG_SND_X86
deleted file mode 100644
index 310c61afc..000000000
--- a/baseconfig/x86/CONFIG_SND_X86
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_X86=y
diff --git a/baseconfig/x86/CONFIG_SONYPI_COMPAT b/baseconfig/x86/CONFIG_SONYPI_COMPAT
deleted file mode 100644
index 6655c779b..000000000
--- a/baseconfig/x86/CONFIG_SONYPI_COMPAT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SONYPI_COMPAT=y
diff --git a/baseconfig/x86/CONFIG_SONY_LAPTOP b/baseconfig/x86/CONFIG_SONY_LAPTOP
deleted file mode 100644
index a31919301..000000000
--- a/baseconfig/x86/CONFIG_SONY_LAPTOP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SONY_LAPTOP=m
diff --git a/baseconfig/x86/CONFIG_SP5100_TCO b/baseconfig/x86/CONFIG_SP5100_TCO
deleted file mode 100644
index db59115bf..000000000
--- a/baseconfig/x86/CONFIG_SP5100_TCO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SP5100_TCO=m
diff --git a/baseconfig/x86/CONFIG_SPI b/baseconfig/x86/CONFIG_SPI
deleted file mode 100644
index 5616bfc48..000000000
--- a/baseconfig/x86/CONFIG_SPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI=y
diff --git a/baseconfig/x86/CONFIG_SPI_CADENCE b/baseconfig/x86/CONFIG_SPI_CADENCE
deleted file mode 100644
index 78e16ec97..000000000
--- a/baseconfig/x86/CONFIG_SPI_CADENCE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SPI_CADENCE is not set
diff --git a/baseconfig/x86/CONFIG_SPI_MASTER b/baseconfig/x86/CONFIG_SPI_MASTER
deleted file mode 100644
index 63f789d5b..000000000
--- a/baseconfig/x86/CONFIG_SPI_MASTER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_MASTER=y
diff --git a/baseconfig/x86/CONFIG_SPI_PXA2XX b/baseconfig/x86/CONFIG_SPI_PXA2XX
deleted file mode 100644
index 99db8d26f..000000000
--- a/baseconfig/x86/CONFIG_SPI_PXA2XX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_PXA2XX=m
diff --git a/baseconfig/x86/CONFIG_SPI_ZYNQMP_GQSPI b/baseconfig/x86/CONFIG_SPI_ZYNQMP_GQSPI
deleted file mode 100644
index 48e520fd6..000000000
--- a/baseconfig/x86/CONFIG_SPI_ZYNQMP_GQSPI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SPI_ZYNQMP_GQSPI is not set
diff --git a/baseconfig/x86/CONFIG_SURFACE3_WMI b/baseconfig/x86/CONFIG_SURFACE3_WMI
deleted file mode 100644
index d2fbd9c7b..000000000
--- a/baseconfig/x86/CONFIG_SURFACE3_WMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SURFACE3_WMI=m
diff --git a/baseconfig/x86/CONFIG_SURFACE_3_BUTTON b/baseconfig/x86/CONFIG_SURFACE_3_BUTTON
deleted file mode 100644
index 8ba50033b..000000000
--- a/baseconfig/x86/CONFIG_SURFACE_3_BUTTON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SURFACE_3_BUTTON=m
diff --git a/baseconfig/x86/CONFIG_SURFACE_PRO3_BUTTON b/baseconfig/x86/CONFIG_SURFACE_PRO3_BUTTON
deleted file mode 100644
index 71e1bf47b..000000000
--- a/baseconfig/x86/CONFIG_SURFACE_PRO3_BUTTON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SURFACE_PRO3_BUTTON=m
diff --git a/baseconfig/x86/CONFIG_TCG_INFINEON b/baseconfig/x86/CONFIG_TCG_INFINEON
deleted file mode 100644
index d73a2c668..000000000
--- a/baseconfig/x86/CONFIG_TCG_INFINEON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TCG_INFINEON=m
diff --git a/baseconfig/x86/CONFIG_THERMAL_GOV_BANG_BANG b/baseconfig/x86/CONFIG_THERMAL_GOV_BANG_BANG
deleted file mode 100644
index 7f6f73a46..000000000
--- a/baseconfig/x86/CONFIG_THERMAL_GOV_BANG_BANG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THERMAL_GOV_BANG_BANG=y
diff --git a/baseconfig/x86/CONFIG_THERMAL_GOV_USER_SPACE b/baseconfig/x86/CONFIG_THERMAL_GOV_USER_SPACE
deleted file mode 100644
index 040cf3947..000000000
--- a/baseconfig/x86/CONFIG_THERMAL_GOV_USER_SPACE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THERMAL_GOV_USER_SPACE=y
diff --git a/baseconfig/x86/CONFIG_THERMAL_WRITABLE_TRIPS b/baseconfig/x86/CONFIG_THERMAL_WRITABLE_TRIPS
deleted file mode 100644
index a0a8924e0..000000000
--- a/baseconfig/x86/CONFIG_THERMAL_WRITABLE_TRIPS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THERMAL_WRITABLE_TRIPS=y
diff --git a/baseconfig/x86/CONFIG_THINKPAD_ACPI b/baseconfig/x86/CONFIG_THINKPAD_ACPI
deleted file mode 100644
index b56a7701d..000000000
--- a/baseconfig/x86/CONFIG_THINKPAD_ACPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THINKPAD_ACPI=m
diff --git a/baseconfig/x86/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT b/baseconfig/x86/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT
deleted file mode 100644
index 5b406b9ba..000000000
--- a/baseconfig/x86/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
diff --git a/baseconfig/x86/CONFIG_THINKPAD_ACPI_DEBUG b/baseconfig/x86/CONFIG_THINKPAD_ACPI_DEBUG
deleted file mode 100644
index 10e6eb6a7..000000000
--- a/baseconfig/x86/CONFIG_THINKPAD_ACPI_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
diff --git a/baseconfig/x86/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES b/baseconfig/x86/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES
deleted file mode 100644
index 0673591f5..000000000
--- a/baseconfig/x86/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
diff --git a/baseconfig/x86/CONFIG_THINKPAD_ACPI_HOTKEY_POLL b/baseconfig/x86/CONFIG_THINKPAD_ACPI_HOTKEY_POLL
deleted file mode 100644
index cf6a85819..000000000
--- a/baseconfig/x86/CONFIG_THINKPAD_ACPI_HOTKEY_POLL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
diff --git a/baseconfig/x86/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS b/baseconfig/x86/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS
deleted file mode 100644
index 535380b27..000000000
--- a/baseconfig/x86/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
diff --git a/baseconfig/x86/CONFIG_THINKPAD_ACPI_VIDEO b/baseconfig/x86/CONFIG_THINKPAD_ACPI_VIDEO
deleted file mode 100644
index a13ebc06b..000000000
--- a/baseconfig/x86/CONFIG_THINKPAD_ACPI_VIDEO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THINKPAD_ACPI_VIDEO=y
diff --git a/baseconfig/x86/CONFIG_TOPSTAR_LAPTOP b/baseconfig/x86/CONFIG_TOPSTAR_LAPTOP
deleted file mode 100644
index d38a75930..000000000
--- a/baseconfig/x86/CONFIG_TOPSTAR_LAPTOP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TOPSTAR_LAPTOP=m
diff --git a/baseconfig/x86/CONFIG_TOSHIBA_BT_RFKILL b/baseconfig/x86/CONFIG_TOSHIBA_BT_RFKILL
deleted file mode 100644
index 07f3cf8b1..000000000
--- a/baseconfig/x86/CONFIG_TOSHIBA_BT_RFKILL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TOSHIBA_BT_RFKILL=m
diff --git a/baseconfig/x86/CONFIG_TOSHIBA_HAPS b/baseconfig/x86/CONFIG_TOSHIBA_HAPS
deleted file mode 100644
index 1c4725a63..000000000
--- a/baseconfig/x86/CONFIG_TOSHIBA_HAPS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TOSHIBA_HAPS=m
diff --git a/baseconfig/x86/CONFIG_TOSHIBA_WMI b/baseconfig/x86/CONFIG_TOSHIBA_WMI
deleted file mode 100644
index 2d91fbb25..000000000
--- a/baseconfig/x86/CONFIG_TOSHIBA_WMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TOSHIBA_WMI=m
diff --git a/baseconfig/x86/CONFIG_TOUCHSCREEN_CY8CTMG110 b/baseconfig/x86/CONFIG_TOUCHSCREEN_CY8CTMG110
deleted file mode 100644
index 0e43d53b5..000000000
--- a/baseconfig/x86/CONFIG_TOUCHSCREEN_CY8CTMG110
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
diff --git a/baseconfig/x86/CONFIG_TOUCHSCREEN_GOODIX b/baseconfig/x86/CONFIG_TOUCHSCREEN_GOODIX
deleted file mode 100644
index ad45d6831..000000000
--- a/baseconfig/x86/CONFIG_TOUCHSCREEN_GOODIX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TOUCHSCREEN_GOODIX=m
diff --git a/baseconfig/x86/CONFIG_TOUCHSCREEN_INTEL_MID b/baseconfig/x86/CONFIG_TOUCHSCREEN_INTEL_MID
deleted file mode 100644
index 097977c2c..000000000
--- a/baseconfig/x86/CONFIG_TOUCHSCREEN_INTEL_MID
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TOUCHSCREEN_INTEL_MID is not set
diff --git a/baseconfig/x86/CONFIG_TOUCHSCREEN_SURFACE3_SPI b/baseconfig/x86/CONFIG_TOUCHSCREEN_SURFACE3_SPI
deleted file mode 100644
index 9bf9d49f2..000000000
--- a/baseconfig/x86/CONFIG_TOUCHSCREEN_SURFACE3_SPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
diff --git a/baseconfig/x86/CONFIG_UID16 b/baseconfig/x86/CONFIG_UID16
deleted file mode 100644
index c766b9089..000000000
--- a/baseconfig/x86/CONFIG_UID16
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_UID16=y
diff --git a/baseconfig/x86/CONFIG_USB_SERIAL_MOS7715_PARPORT b/baseconfig/x86/CONFIG_USB_SERIAL_MOS7715_PARPORT
deleted file mode 100644
index 87be7826c..000000000
--- a/baseconfig/x86/CONFIG_USB_SERIAL_MOS7715_PARPORT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
diff --git a/baseconfig/x86/CONFIG_VFIO_PCI_VGA b/baseconfig/x86/CONFIG_VFIO_PCI_VGA
deleted file mode 100644
index 915f9bd81..000000000
--- a/baseconfig/x86/CONFIG_VFIO_PCI_VGA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VFIO_PCI_VGA=y
diff --git a/baseconfig/x86/CONFIG_VGA_SWITCHEROO b/baseconfig/x86/CONFIG_VGA_SWITCHEROO
deleted file mode 100644
index 1bfcb26d6..000000000
--- a/baseconfig/x86/CONFIG_VGA_SWITCHEROO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VGA_SWITCHEROO=y
diff --git a/baseconfig/x86/CONFIG_VIA_WDT b/baseconfig/x86/CONFIG_VIA_WDT
deleted file mode 100644
index cf0dc5e89..000000000
--- a/baseconfig/x86/CONFIG_VIA_WDT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIA_WDT=m
diff --git a/baseconfig/x86/CONFIG_VIDEO_VIA_CAMERA b/baseconfig/x86/CONFIG_VIDEO_VIA_CAMERA
deleted file mode 100644
index d413ef1f9..000000000
--- a/baseconfig/x86/CONFIG_VIDEO_VIA_CAMERA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_VIA_CAMERA=m
diff --git a/baseconfig/x86/CONFIG_VMD b/baseconfig/x86/CONFIG_VMD
deleted file mode 100644
index 8b55f8786..000000000
--- a/baseconfig/x86/CONFIG_VMD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VMD=m
diff --git a/baseconfig/x86/CONFIG_VMWARE_BALLOON b/baseconfig/x86/CONFIG_VMWARE_BALLOON
deleted file mode 100644
index 324a0cebc..000000000
--- a/baseconfig/x86/CONFIG_VMWARE_BALLOON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VMWARE_BALLOON=m
diff --git a/baseconfig/x86/CONFIG_VMWARE_PVSCSI b/baseconfig/x86/CONFIG_VMWARE_PVSCSI
deleted file mode 100644
index 3568e9188..000000000
--- a/baseconfig/x86/CONFIG_VMWARE_PVSCSI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VMWARE_PVSCSI=m
diff --git a/baseconfig/x86/CONFIG_VMWARE_VMCI b/baseconfig/x86/CONFIG_VMWARE_VMCI
deleted file mode 100644
index e54667c66..000000000
--- a/baseconfig/x86/CONFIG_VMWARE_VMCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VMWARE_VMCI=m
diff --git a/baseconfig/x86/CONFIG_VMWARE_VMCI_VSOCKETS b/baseconfig/x86/CONFIG_VMWARE_VMCI_VSOCKETS
deleted file mode 100644
index e49bd5cf2..000000000
--- a/baseconfig/x86/CONFIG_VMWARE_VMCI_VSOCKETS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VMWARE_VMCI_VSOCKETS=m
diff --git a/baseconfig/x86/CONFIG_VMXNET3 b/baseconfig/x86/CONFIG_VMXNET3
deleted file mode 100644
index a5a8f9fa7..000000000
--- a/baseconfig/x86/CONFIG_VMXNET3
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VMXNET3=m
diff --git a/baseconfig/x86/CONFIG_WMI_BMOF b/baseconfig/x86/CONFIG_WMI_BMOF
deleted file mode 100644
index 61dcf543b..000000000
--- a/baseconfig/x86/CONFIG_WMI_BMOF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_WMI_BMOF=m
diff --git a/baseconfig/x86/CONFIG_X86_ACPI_CPUFREQ b/baseconfig/x86/CONFIG_X86_ACPI_CPUFREQ
deleted file mode 100644
index 95aca6535..000000000
--- a/baseconfig/x86/CONFIG_X86_ACPI_CPUFREQ
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_ACPI_CPUFREQ=m
diff --git a/baseconfig/x86/CONFIG_X86_ACPI_CPUFREQ_CPB b/baseconfig/x86/CONFIG_X86_ACPI_CPUFREQ_CPB
deleted file mode 100644
index db5a9b22b..000000000
--- a/baseconfig/x86/CONFIG_X86_ACPI_CPUFREQ_CPB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_ACPI_CPUFREQ_CPB=y
diff --git a/baseconfig/x86/CONFIG_X86_AMD_FREQ_SENSITIVITY b/baseconfig/x86/CONFIG_X86_AMD_FREQ_SENSITIVITY
deleted file mode 100644
index 30b790026..000000000
--- a/baseconfig/x86/CONFIG_X86_AMD_FREQ_SENSITIVITY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
diff --git a/baseconfig/x86/CONFIG_X86_AMD_PLATFORM_DEVICE b/baseconfig/x86/CONFIG_X86_AMD_PLATFORM_DEVICE
deleted file mode 100644
index 15b9c575b..000000000
--- a/baseconfig/x86/CONFIG_X86_AMD_PLATFORM_DEVICE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
diff --git a/baseconfig/x86/CONFIG_X86_CHECK_BIOS_CORRUPTION b/baseconfig/x86/CONFIG_X86_CHECK_BIOS_CORRUPTION
deleted file mode 100644
index be693cd81..000000000
--- a/baseconfig/x86/CONFIG_X86_CHECK_BIOS_CORRUPTION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_CHECK_BIOS_CORRUPTION=y
diff --git a/baseconfig/x86/CONFIG_X86_CPUID b/baseconfig/x86/CONFIG_X86_CPUID
deleted file mode 100644
index 165a10160..000000000
--- a/baseconfig/x86/CONFIG_X86_CPUID
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_CPUID=y
diff --git a/baseconfig/x86/CONFIG_X86_DEBUG_FPU b/baseconfig/x86/CONFIG_X86_DEBUG_FPU
deleted file mode 100644
index 26258a114..000000000
--- a/baseconfig/x86/CONFIG_X86_DEBUG_FPU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_DEBUG_FPU is not set
diff --git a/baseconfig/x86/CONFIG_X86_DECODER_SELFTEST b/baseconfig/x86/CONFIG_X86_DECODER_SELFTEST
deleted file mode 100644
index 4452e43dd..000000000
--- a/baseconfig/x86/CONFIG_X86_DECODER_SELFTEST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_DECODER_SELFTEST=y
diff --git a/baseconfig/x86/CONFIG_X86_EXTENDED_PLATFORM b/baseconfig/x86/CONFIG_X86_EXTENDED_PLATFORM
deleted file mode 100644
index 8000cbb78..000000000
--- a/baseconfig/x86/CONFIG_X86_EXTENDED_PLATFORM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_EXTENDED_PLATFORM=y
diff --git a/baseconfig/x86/CONFIG_X86_GENERIC b/baseconfig/x86/CONFIG_X86_GENERIC
deleted file mode 100644
index 4c1688c38..000000000
--- a/baseconfig/x86/CONFIG_X86_GENERIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_GENERIC=y
diff --git a/baseconfig/x86/CONFIG_X86_GOLDFISH b/baseconfig/x86/CONFIG_X86_GOLDFISH
deleted file mode 100644
index e509890ff..000000000
--- a/baseconfig/x86/CONFIG_X86_GOLDFISH
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_GOLDFISH is not set
diff --git a/baseconfig/x86/CONFIG_X86_INTEL_LPSS b/baseconfig/x86/CONFIG_X86_INTEL_LPSS
deleted file mode 100644
index 2d20612f8..000000000
--- a/baseconfig/x86/CONFIG_X86_INTEL_LPSS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_INTEL_LPSS=y
diff --git a/baseconfig/x86/CONFIG_X86_INTEL_MID b/baseconfig/x86/CONFIG_X86_INTEL_MID
deleted file mode 100644
index 9c338605e..000000000
--- a/baseconfig/x86/CONFIG_X86_INTEL_MID
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_INTEL_MID is not set
diff --git a/baseconfig/x86/CONFIG_X86_INTEL_MPX b/baseconfig/x86/CONFIG_X86_INTEL_MPX
deleted file mode 100644
index ed1a6daeb..000000000
--- a/baseconfig/x86/CONFIG_X86_INTEL_MPX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_INTEL_MPX=y
diff --git a/baseconfig/x86/CONFIG_X86_INTEL_PSTATE b/baseconfig/x86/CONFIG_X86_INTEL_PSTATE
deleted file mode 100644
index 35365aa70..000000000
--- a/baseconfig/x86/CONFIG_X86_INTEL_PSTATE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_INTEL_PSTATE=y
diff --git a/baseconfig/x86/CONFIG_X86_LEGACY_VM86 b/baseconfig/x86/CONFIG_X86_LEGACY_VM86
deleted file mode 100644
index 256143684..000000000
--- a/baseconfig/x86/CONFIG_X86_LEGACY_VM86
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_LEGACY_VM86 is not set
diff --git a/baseconfig/x86/CONFIG_X86_MCE b/baseconfig/x86/CONFIG_X86_MCE
deleted file mode 100644
index de8e48077..000000000
--- a/baseconfig/x86/CONFIG_X86_MCE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_MCE=y
diff --git a/baseconfig/x86/CONFIG_X86_MCE_AMD b/baseconfig/x86/CONFIG_X86_MCE_AMD
deleted file mode 100644
index 7c1f05da9..000000000
--- a/baseconfig/x86/CONFIG_X86_MCE_AMD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_MCE_AMD=y
diff --git a/baseconfig/x86/CONFIG_X86_MCE_INJECT b/baseconfig/x86/CONFIG_X86_MCE_INJECT
deleted file mode 100644
index 1e3d32843..000000000
--- a/baseconfig/x86/CONFIG_X86_MCE_INJECT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_MCE_INJECT=m
diff --git a/baseconfig/x86/CONFIG_X86_MCE_INTEL b/baseconfig/x86/CONFIG_X86_MCE_INTEL
deleted file mode 100644
index 17f52def2..000000000
--- a/baseconfig/x86/CONFIG_X86_MCE_INTEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_MCE_INTEL=y
diff --git a/baseconfig/x86/CONFIG_X86_MPPARSE b/baseconfig/x86/CONFIG_X86_MPPARSE
deleted file mode 100644
index 1e4f55144..000000000
--- a/baseconfig/x86/CONFIG_X86_MPPARSE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_MPPARSE=y
diff --git a/baseconfig/x86/CONFIG_X86_MSR b/baseconfig/x86/CONFIG_X86_MSR
deleted file mode 100644
index 18d5b64dd..000000000
--- a/baseconfig/x86/CONFIG_X86_MSR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_MSR=y
diff --git a/baseconfig/x86/CONFIG_X86_P4_CLOCKMOD b/baseconfig/x86/CONFIG_X86_P4_CLOCKMOD
deleted file mode 100644
index 714e722dd..000000000
--- a/baseconfig/x86/CONFIG_X86_P4_CLOCKMOD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_P4_CLOCKMOD=m
diff --git a/baseconfig/x86/CONFIG_X86_PAT b/baseconfig/x86/CONFIG_X86_PAT
deleted file mode 100644
index 09f062ec2..000000000
--- a/baseconfig/x86/CONFIG_X86_PAT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_PAT=y
diff --git a/baseconfig/x86/CONFIG_X86_PCC_CPUFREQ b/baseconfig/x86/CONFIG_X86_PCC_CPUFREQ
deleted file mode 100644
index 10c283d7d..000000000
--- a/baseconfig/x86/CONFIG_X86_PCC_CPUFREQ
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_PCC_CPUFREQ=m
diff --git a/baseconfig/x86/CONFIG_X86_PKG_TEMP_THERMAL b/baseconfig/x86/CONFIG_X86_PKG_TEMP_THERMAL
deleted file mode 100644
index 8fb87c3a6..000000000
--- a/baseconfig/x86/CONFIG_X86_PKG_TEMP_THERMAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_PKG_TEMP_THERMAL=m
diff --git a/baseconfig/x86/CONFIG_X86_PLATFORM_DEVICES b/baseconfig/x86/CONFIG_X86_PLATFORM_DEVICES
deleted file mode 100644
index 9f3b3e436..000000000
--- a/baseconfig/x86/CONFIG_X86_PLATFORM_DEVICES
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_PLATFORM_DEVICES=y
diff --git a/baseconfig/x86/CONFIG_X86_PMEM_LEGACY b/baseconfig/x86/CONFIG_X86_PMEM_LEGACY
deleted file mode 100644
index 3ac539aca..000000000
--- a/baseconfig/x86/CONFIG_X86_PMEM_LEGACY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_PMEM_LEGACY=y
diff --git a/baseconfig/x86/CONFIG_X86_PM_TIMER b/baseconfig/x86/CONFIG_X86_PM_TIMER
deleted file mode 100644
index 75c2da2a4..000000000
--- a/baseconfig/x86/CONFIG_X86_PM_TIMER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_PM_TIMER=y
diff --git a/baseconfig/x86/CONFIG_X86_POWERNOW_K8 b/baseconfig/x86/CONFIG_X86_POWERNOW_K8
deleted file mode 100644
index 07b56a824..000000000
--- a/baseconfig/x86/CONFIG_X86_POWERNOW_K8
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_POWERNOW_K8=m
diff --git a/baseconfig/x86/CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS b/baseconfig/x86/CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS
deleted file mode 100644
index d7dc1147e..000000000
--- a/baseconfig/x86/CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
diff --git a/baseconfig/x86/CONFIG_X86_RESERVE_LOW b/baseconfig/x86/CONFIG_X86_RESERVE_LOW
deleted file mode 100644
index 663538c26..000000000
--- a/baseconfig/x86/CONFIG_X86_RESERVE_LOW
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_RESERVE_LOW=64
diff --git a/baseconfig/x86/CONFIG_X86_SPEEDSTEP_CENTRINO b/baseconfig/x86/CONFIG_X86_SPEEDSTEP_CENTRINO
deleted file mode 100644
index ea1e56da2..000000000
--- a/baseconfig/x86/CONFIG_X86_SPEEDSTEP_CENTRINO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
diff --git a/baseconfig/x86/CONFIG_X86_SYSFB b/baseconfig/x86/CONFIG_X86_SYSFB
deleted file mode 100644
index fce62660e..000000000
--- a/baseconfig/x86/CONFIG_X86_SYSFB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_SYSFB is not set
diff --git a/baseconfig/x86/CONFIG_X86_VERBOSE_BOOTUP b/baseconfig/x86/CONFIG_X86_VERBOSE_BOOTUP
deleted file mode 100644
index e209c212b..000000000
--- a/baseconfig/x86/CONFIG_X86_VERBOSE_BOOTUP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_VERBOSE_BOOTUP is not set
diff --git a/baseconfig/x86/CONFIG_XEN b/baseconfig/x86/CONFIG_XEN
deleted file mode 100644
index a4985b44e..000000000
--- a/baseconfig/x86/CONFIG_XEN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN=y
diff --git a/baseconfig/x86/CONFIG_XENFS b/baseconfig/x86/CONFIG_XENFS
deleted file mode 100644
index 2a9db2ee7..000000000
--- a/baseconfig/x86/CONFIG_XENFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XENFS=m
diff --git a/baseconfig/x86/CONFIG_XEN_ACPI_PROCESSOR b/baseconfig/x86/CONFIG_XEN_ACPI_PROCESSOR
deleted file mode 100644
index ce86cd33d..000000000
--- a/baseconfig/x86/CONFIG_XEN_ACPI_PROCESSOR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_ACPI_PROCESSOR=m
diff --git a/baseconfig/x86/CONFIG_XEN_BACKEND b/baseconfig/x86/CONFIG_XEN_BACKEND
deleted file mode 100644
index b15ca354b..000000000
--- a/baseconfig/x86/CONFIG_XEN_BACKEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_BACKEND=y
diff --git a/baseconfig/x86/CONFIG_XEN_BALLOON b/baseconfig/x86/CONFIG_XEN_BALLOON
deleted file mode 100644
index df2818539..000000000
--- a/baseconfig/x86/CONFIG_XEN_BALLOON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_BALLOON=y
diff --git a/baseconfig/x86/CONFIG_XEN_BLKDEV_BACKEND b/baseconfig/x86/CONFIG_XEN_BLKDEV_BACKEND
deleted file mode 100644
index 214dd3c75..000000000
--- a/baseconfig/x86/CONFIG_XEN_BLKDEV_BACKEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_BLKDEV_BACKEND=m
diff --git a/baseconfig/x86/CONFIG_XEN_BLKDEV_FRONTEND b/baseconfig/x86/CONFIG_XEN_BLKDEV_FRONTEND
deleted file mode 100644
index 5b1ec5f14..000000000
--- a/baseconfig/x86/CONFIG_XEN_BLKDEV_FRONTEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_BLKDEV_FRONTEND=m
diff --git a/baseconfig/x86/CONFIG_XEN_COMPAT_XENFS b/baseconfig/x86/CONFIG_XEN_COMPAT_XENFS
deleted file mode 100644
index 280bc95c8..000000000
--- a/baseconfig/x86/CONFIG_XEN_COMPAT_XENFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_COMPAT_XENFS=y
diff --git a/baseconfig/x86/CONFIG_XEN_DEBUG b/baseconfig/x86/CONFIG_XEN_DEBUG
deleted file mode 100644
index d80f13584..000000000
--- a/baseconfig/x86/CONFIG_XEN_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_XEN_DEBUG is not set
diff --git a/baseconfig/x86/CONFIG_XEN_DEBUG_FS b/baseconfig/x86/CONFIG_XEN_DEBUG_FS
deleted file mode 100644
index f250e987f..000000000
--- a/baseconfig/x86/CONFIG_XEN_DEBUG_FS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_DEBUG_FS=y
diff --git a/baseconfig/x86/CONFIG_XEN_DOM0 b/baseconfig/x86/CONFIG_XEN_DOM0
deleted file mode 100644
index c5cb5d24a..000000000
--- a/baseconfig/x86/CONFIG_XEN_DOM0
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_DOM0=y
diff --git a/baseconfig/x86/CONFIG_XEN_FBDEV_FRONTEND b/baseconfig/x86/CONFIG_XEN_FBDEV_FRONTEND
deleted file mode 100644
index a0d0c69b8..000000000
--- a/baseconfig/x86/CONFIG_XEN_FBDEV_FRONTEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_FBDEV_FRONTEND=y
diff --git a/baseconfig/x86/CONFIG_XEN_GNTDEV b/baseconfig/x86/CONFIG_XEN_GNTDEV
deleted file mode 100644
index 0773eb106..000000000
--- a/baseconfig/x86/CONFIG_XEN_GNTDEV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_GNTDEV=m
diff --git a/baseconfig/x86/CONFIG_XEN_GRANT_DEV_ALLOC b/baseconfig/x86/CONFIG_XEN_GRANT_DEV_ALLOC
deleted file mode 100644
index 9c4e42ad1..000000000
--- a/baseconfig/x86/CONFIG_XEN_GRANT_DEV_ALLOC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_GRANT_DEV_ALLOC=m
diff --git a/baseconfig/x86/CONFIG_XEN_NETDEV_BACKEND b/baseconfig/x86/CONFIG_XEN_NETDEV_BACKEND
deleted file mode 100644
index 8f3e152d3..000000000
--- a/baseconfig/x86/CONFIG_XEN_NETDEV_BACKEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_NETDEV_BACKEND=m
diff --git a/baseconfig/x86/CONFIG_XEN_NETDEV_FRONTEND b/baseconfig/x86/CONFIG_XEN_NETDEV_FRONTEND
deleted file mode 100644
index eb86ad0f8..000000000
--- a/baseconfig/x86/CONFIG_XEN_NETDEV_FRONTEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_NETDEV_FRONTEND=m
diff --git a/baseconfig/x86/CONFIG_XEN_PCIDEV_BACKEND b/baseconfig/x86/CONFIG_XEN_PCIDEV_BACKEND
deleted file mode 100644
index 7d4708d2b..000000000
--- a/baseconfig/x86/CONFIG_XEN_PCIDEV_BACKEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_PCIDEV_BACKEND=m
diff --git a/baseconfig/x86/CONFIG_XEN_PCIDEV_FRONTEND b/baseconfig/x86/CONFIG_XEN_PCIDEV_FRONTEND
deleted file mode 100644
index 9763ad236..000000000
--- a/baseconfig/x86/CONFIG_XEN_PCIDEV_FRONTEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_PCIDEV_FRONTEND=m
diff --git a/baseconfig/x86/CONFIG_XEN_PV b/baseconfig/x86/CONFIG_XEN_PV
deleted file mode 100644
index 89203e84e..000000000
--- a/baseconfig/x86/CONFIG_XEN_PV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_PV=y
diff --git a/baseconfig/x86/CONFIG_XEN_PVCALLS_BACKEND b/baseconfig/x86/CONFIG_XEN_PVCALLS_BACKEND
deleted file mode 100644
index 3a5b2c46d..000000000
--- a/baseconfig/x86/CONFIG_XEN_PVCALLS_BACKEND
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_XEN_PVCALLS_BACKEND is not set
diff --git a/baseconfig/x86/CONFIG_XEN_PVH b/baseconfig/x86/CONFIG_XEN_PVH
deleted file mode 100644
index 5f8642963..000000000
--- a/baseconfig/x86/CONFIG_XEN_PVH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_PVH=y
diff --git a/baseconfig/x86/CONFIG_XEN_PVHVM b/baseconfig/x86/CONFIG_XEN_PVHVM
deleted file mode 100644
index be722d220..000000000
--- a/baseconfig/x86/CONFIG_XEN_PVHVM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_PVHVM=y
diff --git a/baseconfig/x86/CONFIG_XEN_SAVE_RESTORE b/baseconfig/x86/CONFIG_XEN_SAVE_RESTORE
deleted file mode 100644
index b42ea5137..000000000
--- a/baseconfig/x86/CONFIG_XEN_SAVE_RESTORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_SAVE_RESTORE=y
diff --git a/baseconfig/x86/CONFIG_XEN_SCRUB_PAGES b/baseconfig/x86/CONFIG_XEN_SCRUB_PAGES
deleted file mode 100644
index e8e080270..000000000
--- a/baseconfig/x86/CONFIG_XEN_SCRUB_PAGES
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_SCRUB_PAGES=y
diff --git a/baseconfig/x86/CONFIG_XEN_SCSI_BACKEND b/baseconfig/x86/CONFIG_XEN_SCSI_BACKEND
deleted file mode 100644
index b995785c5..000000000
--- a/baseconfig/x86/CONFIG_XEN_SCSI_BACKEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_SCSI_BACKEND=m
diff --git a/baseconfig/x86/CONFIG_XEN_SCSI_FRONTEND b/baseconfig/x86/CONFIG_XEN_SCSI_FRONTEND
deleted file mode 100644
index b01eb3787..000000000
--- a/baseconfig/x86/CONFIG_XEN_SCSI_FRONTEND
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_SCSI_FRONTEND=m
diff --git a/baseconfig/x86/CONFIG_XEN_SELFBALLOONING b/baseconfig/x86/CONFIG_XEN_SELFBALLOONING
deleted file mode 100644
index d3fb0cb3d..000000000
--- a/baseconfig/x86/CONFIG_XEN_SELFBALLOONING
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_SELFBALLOONING=y
diff --git a/baseconfig/x86/CONFIG_XEN_SYMS b/baseconfig/x86/CONFIG_XEN_SYMS
deleted file mode 100644
index c7918b924..000000000
--- a/baseconfig/x86/CONFIG_XEN_SYMS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_SYMS=y
diff --git a/baseconfig/x86/CONFIG_XEN_WDT b/baseconfig/x86/CONFIG_XEN_WDT
deleted file mode 100644
index 333aa5528..000000000
--- a/baseconfig/x86/CONFIG_XEN_WDT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_WDT=m
diff --git a/baseconfig/x86/CONFIG_XO15_EBOOK b/baseconfig/x86/CONFIG_XO15_EBOOK
deleted file mode 100644
index c8f4a21b2..000000000
--- a/baseconfig/x86/CONFIG_XO15_EBOOK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XO15_EBOOK=m
diff --git a/baseconfig/x86/CONFIG_XPOWER_PMIC_OPREGION b/baseconfig/x86/CONFIG_XPOWER_PMIC_OPREGION
deleted file mode 100644
index 8c98df142..000000000
--- a/baseconfig/x86/CONFIG_XPOWER_PMIC_OPREGION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XPOWER_PMIC_OPREGION=y
diff --git a/baseconfig/x86/CONFIG_XZ_DEC_X86 b/baseconfig/x86/CONFIG_XZ_DEC_X86
deleted file mode 100644
index 1be802334..000000000
--- a/baseconfig/x86/CONFIG_XZ_DEC_X86
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XZ_DEC_X86=y
diff --git a/baseconfig/x86/i686/CONFIG_4KSTACKS b/baseconfig/x86/i686/CONFIG_4KSTACKS
deleted file mode 100644
index b3ae285eb..000000000
--- a/baseconfig/x86/i686/CONFIG_4KSTACKS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_4KSTACKS is not set
diff --git a/baseconfig/x86/i686/CONFIG_64BIT b/baseconfig/x86/i686/CONFIG_64BIT
deleted file mode 100644
index 2441d5a81..000000000
--- a/baseconfig/x86/i686/CONFIG_64BIT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_64BIT is not set
diff --git a/baseconfig/x86/i686/CONFIG_ALIX b/baseconfig/x86/i686/CONFIG_ALIX
deleted file mode 100644
index 42007a768..000000000
--- a/baseconfig/x86/i686/CONFIG_ALIX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ALIX is not set
diff --git a/baseconfig/x86/i686/CONFIG_APM b/baseconfig/x86/i686/CONFIG_APM
deleted file mode 100644
index ef1e73d55..000000000
--- a/baseconfig/x86/i686/CONFIG_APM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_APM=y
diff --git a/baseconfig/x86/i686/CONFIG_APM_ALLOW_INTS b/baseconfig/x86/i686/CONFIG_APM_ALLOW_INTS
deleted file mode 100644
index 9a0eef313..000000000
--- a/baseconfig/x86/i686/CONFIG_APM_ALLOW_INTS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_APM_ALLOW_INTS is not set
diff --git a/baseconfig/x86/i686/CONFIG_APM_CPU_IDLE b/baseconfig/x86/i686/CONFIG_APM_CPU_IDLE
deleted file mode 100644
index 874064310..000000000
--- a/baseconfig/x86/i686/CONFIG_APM_CPU_IDLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_APM_CPU_IDLE=y
diff --git a/baseconfig/x86/i686/CONFIG_APM_DISPLAY_BLANK b/baseconfig/x86/i686/CONFIG_APM_DISPLAY_BLANK
deleted file mode 100644
index b2909fb06..000000000
--- a/baseconfig/x86/i686/CONFIG_APM_DISPLAY_BLANK
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_APM_DISPLAY_BLANK is not set
diff --git a/baseconfig/x86/i686/CONFIG_APM_DO_ENABLE b/baseconfig/x86/i686/CONFIG_APM_DO_ENABLE
deleted file mode 100644
index 475553811..000000000
--- a/baseconfig/x86/i686/CONFIG_APM_DO_ENABLE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_APM_DO_ENABLE is not set
diff --git a/baseconfig/x86/i686/CONFIG_APM_IGNORE_USER_SUSPEND b/baseconfig/x86/i686/CONFIG_APM_IGNORE_USER_SUSPEND
deleted file mode 100644
index 45b5324a1..000000000
--- a/baseconfig/x86/i686/CONFIG_APM_IGNORE_USER_SUSPEND
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_APM_IGNORE_USER_SUSPEND is not set
diff --git a/baseconfig/x86/i686/CONFIG_BACKLIGHT_OT200 b/baseconfig/x86/i686/CONFIG_BACKLIGHT_OT200
deleted file mode 100644
index 7fc698fe0..000000000
--- a/baseconfig/x86/i686/CONFIG_BACKLIGHT_OT200
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BACKLIGHT_OT200 is not set
diff --git a/baseconfig/x86/i686/CONFIG_BACKLIGHT_PWM b/baseconfig/x86/i686/CONFIG_BACKLIGHT_PWM
deleted file mode 100644
index 44737e214..000000000
--- a/baseconfig/x86/i686/CONFIG_BACKLIGHT_PWM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BACKLIGHT_PWM=m
diff --git a/baseconfig/x86/i686/CONFIG_BATTERY_OLPC b/baseconfig/x86/i686/CONFIG_BATTERY_OLPC
deleted file mode 100644
index 1270fb00f..000000000
--- a/baseconfig/x86/i686/CONFIG_BATTERY_OLPC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BATTERY_OLPC=y
diff --git a/baseconfig/x86/i686/CONFIG_CRYPTO_AES_586 b/baseconfig/x86/i686/CONFIG_CRYPTO_AES_586
deleted file mode 100644
index 4702bf09c..000000000
--- a/baseconfig/x86/i686/CONFIG_CRYPTO_AES_586
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_AES_586=y
diff --git a/baseconfig/x86/i686/CONFIG_CRYPTO_CRYPTD b/baseconfig/x86/i686/CONFIG_CRYPTO_CRYPTD
deleted file mode 100644
index 36649cff3..000000000
--- a/baseconfig/x86/i686/CONFIG_CRYPTO_CRYPTD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CRYPTD=y
diff --git a/baseconfig/x86/i686/CONFIG_CRYPTO_DEV_GEODE b/baseconfig/x86/i686/CONFIG_CRYPTO_DEV_GEODE
deleted file mode 100644
index 751bb8680..000000000
--- a/baseconfig/x86/i686/CONFIG_CRYPTO_DEV_GEODE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_GEODE=m
diff --git a/baseconfig/x86/i686/CONFIG_CRYPTO_LRW b/baseconfig/x86/i686/CONFIG_CRYPTO_LRW
deleted file mode 100644
index 602a90482..000000000
--- a/baseconfig/x86/i686/CONFIG_CRYPTO_LRW
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_LRW=y
diff --git a/baseconfig/x86/i686/CONFIG_CRYPTO_TWOFISH_586 b/baseconfig/x86/i686/CONFIG_CRYPTO_TWOFISH_586
deleted file mode 100644
index 3f9979eb7..000000000
--- a/baseconfig/x86/i686/CONFIG_CRYPTO_TWOFISH_586
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_TWOFISH_586=m
diff --git a/baseconfig/x86/i686/CONFIG_CS5535_CLOCK_EVENT_SRC b/baseconfig/x86/i686/CONFIG_CS5535_CLOCK_EVENT_SRC
deleted file mode 100644
index 091ab254d..000000000
--- a/baseconfig/x86/i686/CONFIG_CS5535_CLOCK_EVENT_SRC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
diff --git a/baseconfig/x86/i686/CONFIG_CS5535_MFGPT b/baseconfig/x86/i686/CONFIG_CS5535_MFGPT
deleted file mode 100644
index 3699e8a4e..000000000
--- a/baseconfig/x86/i686/CONFIG_CS5535_MFGPT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CS5535_MFGPT=m
diff --git a/baseconfig/x86/i686/CONFIG_DW_DMAC_CORE b/baseconfig/x86/i686/CONFIG_DW_DMAC_CORE
deleted file mode 100644
index 110558a22..000000000
--- a/baseconfig/x86/i686/CONFIG_DW_DMAC_CORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DW_DMAC_CORE=y
diff --git a/baseconfig/x86/i686/CONFIG_DW_DMAC_PCI b/baseconfig/x86/i686/CONFIG_DW_DMAC_PCI
deleted file mode 100644
index 2a2239b24..000000000
--- a/baseconfig/x86/i686/CONFIG_DW_DMAC_PCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DW_DMAC_PCI=y
diff --git a/baseconfig/x86/i686/CONFIG_EDAC_AMD76X b/baseconfig/x86/i686/CONFIG_EDAC_AMD76X
deleted file mode 100644
index fe5952e70..000000000
--- a/baseconfig/x86/i686/CONFIG_EDAC_AMD76X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_AMD76X=m
diff --git a/baseconfig/x86/i686/CONFIG_EDAC_E7XXX b/baseconfig/x86/i686/CONFIG_EDAC_E7XXX
deleted file mode 100644
index 0322ddb69..000000000
--- a/baseconfig/x86/i686/CONFIG_EDAC_E7XXX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_E7XXX=m
diff --git a/baseconfig/x86/i686/CONFIG_EDAC_I82860 b/baseconfig/x86/i686/CONFIG_EDAC_I82860
deleted file mode 100644
index 5e132db1a..000000000
--- a/baseconfig/x86/i686/CONFIG_EDAC_I82860
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_I82860=m
diff --git a/baseconfig/x86/i686/CONFIG_EDAC_I82875P b/baseconfig/x86/i686/CONFIG_EDAC_I82875P
deleted file mode 100644
index dbe32d406..000000000
--- a/baseconfig/x86/i686/CONFIG_EDAC_I82875P
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_I82875P=m
diff --git a/baseconfig/x86/i686/CONFIG_EDAC_R82600 b/baseconfig/x86/i686/CONFIG_EDAC_R82600
deleted file mode 100644
index 93a01e506..000000000
--- a/baseconfig/x86/i686/CONFIG_EDAC_R82600
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_R82600=m
diff --git a/baseconfig/x86/i686/CONFIG_FB_GEODE b/baseconfig/x86/i686/CONFIG_FB_GEODE
deleted file mode 100644
index 0f1c77894..000000000
--- a/baseconfig/x86/i686/CONFIG_FB_GEODE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_GEODE=y
diff --git a/baseconfig/x86/i686/CONFIG_FB_GEODE_GX b/baseconfig/x86/i686/CONFIG_FB_GEODE_GX
deleted file mode 100644
index 08da10775..000000000
--- a/baseconfig/x86/i686/CONFIG_FB_GEODE_GX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_GEODE_GX=y
diff --git a/baseconfig/x86/i686/CONFIG_FB_GEODE_GX1 b/baseconfig/x86/i686/CONFIG_FB_GEODE_GX1
deleted file mode 100644
index 55532c98a..000000000
--- a/baseconfig/x86/i686/CONFIG_FB_GEODE_GX1
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_GEODE_GX1 is not set
diff --git a/baseconfig/x86/i686/CONFIG_FB_GEODE_LX b/baseconfig/x86/i686/CONFIG_FB_GEODE_LX
deleted file mode 100644
index 382bfc6e1..000000000
--- a/baseconfig/x86/i686/CONFIG_FB_GEODE_LX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_GEODE_LX=y
diff --git a/baseconfig/x86/i686/CONFIG_FB_MODE_HELPERS b/baseconfig/x86/i686/CONFIG_FB_MODE_HELPERS
deleted file mode 100644
index 84f515748..000000000
--- a/baseconfig/x86/i686/CONFIG_FB_MODE_HELPERS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_MODE_HELPERS=y
diff --git a/baseconfig/x86/i686/CONFIG_FB_OLPC_DCON b/baseconfig/x86/i686/CONFIG_FB_OLPC_DCON
deleted file mode 100644
index 5e1569153..000000000
--- a/baseconfig/x86/i686/CONFIG_FB_OLPC_DCON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_OLPC_DCON is not set
diff --git a/baseconfig/x86/i686/CONFIG_FB_SSD1307 b/baseconfig/x86/i686/CONFIG_FB_SSD1307
deleted file mode 100644
index efd995bdf..000000000
--- a/baseconfig/x86/i686/CONFIG_FB_SSD1307
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_SSD1307=m
diff --git a/baseconfig/x86/i686/CONFIG_GENERIC_PHY b/baseconfig/x86/i686/CONFIG_GENERIC_PHY
deleted file mode 100644
index 40cd1a4f5..000000000
--- a/baseconfig/x86/i686/CONFIG_GENERIC_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GENERIC_PHY=y
diff --git a/baseconfig/x86/i686/CONFIG_GEODE_WDT b/baseconfig/x86/i686/CONFIG_GEODE_WDT
deleted file mode 100644
index b6e9726e0..000000000
--- a/baseconfig/x86/i686/CONFIG_GEODE_WDT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GEODE_WDT=m
diff --git a/baseconfig/x86/i686/CONFIG_GEOS b/baseconfig/x86/i686/CONFIG_GEOS
deleted file mode 100644
index e3c72149c..000000000
--- a/baseconfig/x86/i686/CONFIG_GEOS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GEOS is not set
diff --git a/baseconfig/x86/i686/CONFIG_GPIO_74XX_MMIO b/baseconfig/x86/i686/CONFIG_GPIO_74XX_MMIO
deleted file mode 100644
index b761ec18a..000000000
--- a/baseconfig/x86/i686/CONFIG_GPIO_74XX_MMIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_74XX_MMIO is not set
diff --git a/baseconfig/x86/i686/CONFIG_GPIO_CS5535 b/baseconfig/x86/i686/CONFIG_GPIO_CS5535
deleted file mode 100644
index 91ff2409a..000000000
--- a/baseconfig/x86/i686/CONFIG_GPIO_CS5535
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_CS5535=y
diff --git a/baseconfig/x86/i686/CONFIG_GPIO_SCH b/baseconfig/x86/i686/CONFIG_GPIO_SCH
deleted file mode 100644
index 81dcf7191..000000000
--- a/baseconfig/x86/i686/CONFIG_GPIO_SCH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_SCH=m
diff --git a/baseconfig/x86/i686/CONFIG_GPIO_SODAVILLE b/baseconfig/x86/i686/CONFIG_GPIO_SODAVILLE
deleted file mode 100644
index f6c07b049..000000000
--- a/baseconfig/x86/i686/CONFIG_GPIO_SODAVILLE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_SODAVILLE is not set
diff --git a/baseconfig/x86/i686/CONFIG_HIGHMEM b/baseconfig/x86/i686/CONFIG_HIGHMEM
deleted file mode 100644
index ae91367ff..000000000
--- a/baseconfig/x86/i686/CONFIG_HIGHMEM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HIGHMEM=y
diff --git a/baseconfig/x86/i686/CONFIG_HIGHMEM4G b/baseconfig/x86/i686/CONFIG_HIGHMEM4G
deleted file mode 100644
index 87e34270c..000000000
--- a/baseconfig/x86/i686/CONFIG_HIGHMEM4G
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HIGHMEM4G=y
diff --git a/baseconfig/x86/i686/CONFIG_HIGHMEM64G b/baseconfig/x86/i686/CONFIG_HIGHMEM64G
deleted file mode 100644
index 99d4c1998..000000000
--- a/baseconfig/x86/i686/CONFIG_HIGHMEM64G
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_HIGHMEM64G is not set
diff --git a/baseconfig/x86/i686/CONFIG_HIGHPTE b/baseconfig/x86/i686/CONFIG_HIGHPTE
deleted file mode 100644
index e11904f2f..000000000
--- a/baseconfig/x86/i686/CONFIG_HIGHPTE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HIGHPTE=y
diff --git a/baseconfig/x86/i686/CONFIG_HOTPLUG_PCI_SHPC b/baseconfig/x86/i686/CONFIG_HOTPLUG_PCI_SHPC
deleted file mode 100644
index f03be8a8f..000000000
--- a/baseconfig/x86/i686/CONFIG_HOTPLUG_PCI_SHPC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_HOTPLUG_PCI_SHPC is not set
diff --git a/baseconfig/x86/i686/CONFIG_HSU_DMA b/baseconfig/x86/i686/CONFIG_HSU_DMA
deleted file mode 100644
index 0dcb85dec..000000000
--- a/baseconfig/x86/i686/CONFIG_HSU_DMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HSU_DMA=y
diff --git a/baseconfig/x86/i686/CONFIG_HW_RANDOM_GEODE b/baseconfig/x86/i686/CONFIG_HW_RANDOM_GEODE
deleted file mode 100644
index a8c3583f1..000000000
--- a/baseconfig/x86/i686/CONFIG_HW_RANDOM_GEODE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HW_RANDOM_GEODE=m
diff --git a/baseconfig/x86/i686/CONFIG_I2C_ALI1535 b/baseconfig/x86/i686/CONFIG_I2C_ALI1535
deleted file mode 100644
index 9342b1dbc..000000000
--- a/baseconfig/x86/i686/CONFIG_I2C_ALI1535
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_ALI1535=m
diff --git a/baseconfig/x86/i686/CONFIG_I2C_ALI1563 b/baseconfig/x86/i686/CONFIG_I2C_ALI1563
deleted file mode 100644
index c030320fc..000000000
--- a/baseconfig/x86/i686/CONFIG_I2C_ALI1563
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_ALI1563=m
diff --git a/baseconfig/x86/i686/CONFIG_I2C_ALI15X3 b/baseconfig/x86/i686/CONFIG_I2C_ALI15X3
deleted file mode 100644
index df3fff740..000000000
--- a/baseconfig/x86/i686/CONFIG_I2C_ALI15X3
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_ALI15X3=m
diff --git a/baseconfig/x86/i686/CONFIG_I2C_MUX b/baseconfig/x86/i686/CONFIG_I2C_MUX
deleted file mode 100644
index 6982ed98a..000000000
--- a/baseconfig/x86/i686/CONFIG_I2C_MUX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_MUX=m
diff --git a/baseconfig/x86/i686/CONFIG_I2C_SIS5595 b/baseconfig/x86/i686/CONFIG_I2C_SIS5595
deleted file mode 100644
index 6a57af79b..000000000
--- a/baseconfig/x86/i686/CONFIG_I2C_SIS5595
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_SIS5595=m
diff --git a/baseconfig/x86/i686/CONFIG_I2C_SIS630 b/baseconfig/x86/i686/CONFIG_I2C_SIS630
deleted file mode 100644
index 1eff29bc7..000000000
--- a/baseconfig/x86/i686/CONFIG_I2C_SIS630
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_SIS630=m
diff --git a/baseconfig/x86/i686/CONFIG_I2O b/baseconfig/x86/i686/CONFIG_I2O
deleted file mode 100644
index bd51f089f..000000000
--- a/baseconfig/x86/i686/CONFIG_I2O
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2O=m
diff --git a/baseconfig/x86/i686/CONFIG_IB700_WDT b/baseconfig/x86/i686/CONFIG_IB700_WDT
deleted file mode 100644
index 3cf068abd..000000000
--- a/baseconfig/x86/i686/CONFIG_IB700_WDT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IB700_WDT=m
diff --git a/baseconfig/x86/i686/CONFIG_INPUT_GP2A b/baseconfig/x86/i686/CONFIG_INPUT_GP2A
deleted file mode 100644
index 221036349..000000000
--- a/baseconfig/x86/i686/CONFIG_INPUT_GP2A
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_GP2A is not set
diff --git a/baseconfig/x86/i686/CONFIG_INPUT_GPIO_TILT_POLLED b/baseconfig/x86/i686/CONFIG_INPUT_GPIO_TILT_POLLED
deleted file mode 100644
index 8b1ef8c62..000000000
--- a/baseconfig/x86/i686/CONFIG_INPUT_GPIO_TILT_POLLED
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_GPIO_TILT_POLLED is not set
diff --git a/baseconfig/x86/i686/CONFIG_INPUT_MATRIXKMAP b/baseconfig/x86/i686/CONFIG_INPUT_MATRIXKMAP
deleted file mode 100644
index 0f1b2f168..000000000
--- a/baseconfig/x86/i686/CONFIG_INPUT_MATRIXKMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_MATRIXKMAP=m
diff --git a/baseconfig/x86/i686/CONFIG_INPUT_PWM_BEEPER b/baseconfig/x86/i686/CONFIG_INPUT_PWM_BEEPER
deleted file mode 100644
index 59fdb225d..000000000
--- a/baseconfig/x86/i686/CONFIG_INPUT_PWM_BEEPER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_PWM_BEEPER=m
diff --git a/baseconfig/x86/i686/CONFIG_INTEL_TXT b/baseconfig/x86/i686/CONFIG_INTEL_TXT
deleted file mode 100644
index 729b3644f..000000000
--- a/baseconfig/x86/i686/CONFIG_INTEL_TXT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INTEL_TXT is not set
diff --git a/baseconfig/x86/i686/CONFIG_KEXEC_JUMP b/baseconfig/x86/i686/CONFIG_KEXEC_JUMP
deleted file mode 100644
index ac2cebdf4..000000000
--- a/baseconfig/x86/i686/CONFIG_KEXEC_JUMP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_KEXEC_JUMP is not set
diff --git a/baseconfig/x86/i686/CONFIG_KEYBOARD_BCM b/baseconfig/x86/i686/CONFIG_KEYBOARD_BCM
deleted file mode 100644
index d904364b5..000000000
--- a/baseconfig/x86/i686/CONFIG_KEYBOARD_BCM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_KEYBOARD_BCM is not set
diff --git a/baseconfig/x86/i686/CONFIG_LBDAF b/baseconfig/x86/i686/CONFIG_LBDAF
deleted file mode 100644
index b3fae707a..000000000
--- a/baseconfig/x86/i686/CONFIG_LBDAF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LBDAF=y
diff --git a/baseconfig/x86/i686/CONFIG_M486 b/baseconfig/x86/i686/CONFIG_M486
deleted file mode 100644
index 63ff16ad2..000000000
--- a/baseconfig/x86/i686/CONFIG_M486
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_M486 is not set
diff --git a/baseconfig/x86/i686/CONFIG_M586 b/baseconfig/x86/i686/CONFIG_M586
deleted file mode 100644
index 1922a00f8..000000000
--- a/baseconfig/x86/i686/CONFIG_M586
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_M586 is not set
diff --git a/baseconfig/x86/i686/CONFIG_M586MMX b/baseconfig/x86/i686/CONFIG_M586MMX
deleted file mode 100644
index 56306e616..000000000
--- a/baseconfig/x86/i686/CONFIG_M586MMX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_M586MMX is not set
diff --git a/baseconfig/x86/i686/CONFIG_M586TSC b/baseconfig/x86/i686/CONFIG_M586TSC
deleted file mode 100644
index 5e8d7bf18..000000000
--- a/baseconfig/x86/i686/CONFIG_M586TSC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_M586TSC is not set
diff --git a/baseconfig/x86/i686/CONFIG_M686 b/baseconfig/x86/i686/CONFIG_M686
deleted file mode 100644
index 48ecb46e3..000000000
--- a/baseconfig/x86/i686/CONFIG_M686
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_M686=y
diff --git a/baseconfig/x86/i686/CONFIG_MATH_EMULATION b/baseconfig/x86/i686/CONFIG_MATH_EMULATION
deleted file mode 100644
index be33a6a76..000000000
--- a/baseconfig/x86/i686/CONFIG_MATH_EMULATION
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MATH_EMULATION is not set
diff --git a/baseconfig/x86/i686/CONFIG_MCRUSOE b/baseconfig/x86/i686/CONFIG_MCRUSOE
deleted file mode 100644
index de9c313b3..000000000
--- a/baseconfig/x86/i686/CONFIG_MCRUSOE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MCRUSOE is not set
diff --git a/baseconfig/x86/i686/CONFIG_MCYRIXIII b/baseconfig/x86/i686/CONFIG_MCYRIXIII
deleted file mode 100644
index 9386b3779..000000000
--- a/baseconfig/x86/i686/CONFIG_MCYRIXIII
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MCYRIXIII is not set
diff --git a/baseconfig/x86/i686/CONFIG_MDIO_BUS_MUX_GPIO b/baseconfig/x86/i686/CONFIG_MDIO_BUS_MUX_GPIO
deleted file mode 100644
index 27b93466f..000000000
--- a/baseconfig/x86/i686/CONFIG_MDIO_BUS_MUX_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
diff --git a/baseconfig/x86/i686/CONFIG_MDIO_BUS_MUX_MMIOREG b/baseconfig/x86/i686/CONFIG_MDIO_BUS_MUX_MMIOREG
deleted file mode 100644
index 4d738fd98..000000000
--- a/baseconfig/x86/i686/CONFIG_MDIO_BUS_MUX_MMIOREG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
diff --git a/baseconfig/x86/i686/CONFIG_MFD_CS5535 b/baseconfig/x86/i686/CONFIG_MFD_CS5535
deleted file mode 100644
index ac2f3c2fc..000000000
--- a/baseconfig/x86/i686/CONFIG_MFD_CS5535
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_CS5535=m
diff --git a/baseconfig/x86/i686/CONFIG_MK6 b/baseconfig/x86/i686/CONFIG_MK6
deleted file mode 100644
index d8b023cf4..000000000
--- a/baseconfig/x86/i686/CONFIG_MK6
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MK6 is not set
diff --git a/baseconfig/x86/i686/CONFIG_MK7 b/baseconfig/x86/i686/CONFIG_MK7
deleted file mode 100644
index 949a5f991..000000000
--- a/baseconfig/x86/i686/CONFIG_MK7
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MK7 is not set
diff --git a/baseconfig/x86/i686/CONFIG_MK8 b/baseconfig/x86/i686/CONFIG_MK8
deleted file mode 100644
index 2f448241b..000000000
--- a/baseconfig/x86/i686/CONFIG_MK8
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MK8 is not set
diff --git a/baseconfig/x86/i686/CONFIG_MLX5_INFINIBAND b/baseconfig/x86/i686/CONFIG_MLX5_INFINIBAND
deleted file mode 100644
index c09ba1a61..000000000
--- a/baseconfig/x86/i686/CONFIG_MLX5_INFINIBAND
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MLX5_INFINIBAND is not set
diff --git a/baseconfig/x86/i686/CONFIG_MOUSE_PS2_OLPC b/baseconfig/x86/i686/CONFIG_MOUSE_PS2_OLPC
deleted file mode 100644
index a5a03d20c..000000000
--- a/baseconfig/x86/i686/CONFIG_MOUSE_PS2_OLPC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MOUSE_PS2_OLPC=y
diff --git a/baseconfig/x86/i686/CONFIG_MPENTIUM4 b/baseconfig/x86/i686/CONFIG_MPENTIUM4
deleted file mode 100644
index cebe97732..000000000
--- a/baseconfig/x86/i686/CONFIG_MPENTIUM4
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MPENTIUM4 is not set
diff --git a/baseconfig/x86/i686/CONFIG_MPENTIUMII b/baseconfig/x86/i686/CONFIG_MPENTIUMII
deleted file mode 100644
index 10d33aec4..000000000
--- a/baseconfig/x86/i686/CONFIG_MPENTIUMII
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MPENTIUMII is not set
diff --git a/baseconfig/x86/i686/CONFIG_MPENTIUMIII b/baseconfig/x86/i686/CONFIG_MPENTIUMIII
deleted file mode 100644
index 6a631dc84..000000000
--- a/baseconfig/x86/i686/CONFIG_MPENTIUMIII
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MPENTIUMIII is not set
diff --git a/baseconfig/x86/i686/CONFIG_MPENTIUMM b/baseconfig/x86/i686/CONFIG_MPENTIUMM
deleted file mode 100644
index b77ce1640..000000000
--- a/baseconfig/x86/i686/CONFIG_MPENTIUMM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MPENTIUMM is not set
diff --git a/baseconfig/x86/i686/CONFIG_MTD_NAND_CAFE b/baseconfig/x86/i686/CONFIG_MTD_NAND_CAFE
deleted file mode 100644
index ae5227871..000000000
--- a/baseconfig/x86/i686/CONFIG_MTD_NAND_CAFE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_NAND_CAFE=m
diff --git a/baseconfig/x86/i686/CONFIG_MTD_OF_PARTS b/baseconfig/x86/i686/CONFIG_MTD_OF_PARTS
deleted file mode 100644
index bddcc3b5e..000000000
--- a/baseconfig/x86/i686/CONFIG_MTD_OF_PARTS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_OF_PARTS=m
diff --git a/baseconfig/x86/i686/CONFIG_MTD_PHYSMAP_OF b/baseconfig/x86/i686/CONFIG_MTD_PHYSMAP_OF
deleted file mode 100644
index 4558beae6..000000000
--- a/baseconfig/x86/i686/CONFIG_MTD_PHYSMAP_OF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_PHYSMAP_OF=m
diff --git a/baseconfig/x86/i686/CONFIG_MVIAC3_2 b/baseconfig/x86/i686/CONFIG_MVIAC3_2
deleted file mode 100644
index 935c0d447..000000000
--- a/baseconfig/x86/i686/CONFIG_MVIAC3_2
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MVIAC3_2 is not set
diff --git a/baseconfig/x86/i686/CONFIG_MWINCHIP3D b/baseconfig/x86/i686/CONFIG_MWINCHIP3D
deleted file mode 100644
index f311f90ea..000000000
--- a/baseconfig/x86/i686/CONFIG_MWINCHIP3D
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MWINCHIP3D is not set
diff --git a/baseconfig/x86/i686/CONFIG_MWINCHIPC6 b/baseconfig/x86/i686/CONFIG_MWINCHIPC6
deleted file mode 100644
index 24e6694b4..000000000
--- a/baseconfig/x86/i686/CONFIG_MWINCHIPC6
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MWINCHIPC6 is not set
diff --git a/baseconfig/x86/i686/CONFIG_NET5501 b/baseconfig/x86/i686/CONFIG_NET5501
deleted file mode 100644
index 3ed621992..000000000
--- a/baseconfig/x86/i686/CONFIG_NET5501
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET5501 is not set
diff --git a/baseconfig/x86/i686/CONFIG_NOHIGHMEM b/baseconfig/x86/i686/CONFIG_NOHIGHMEM
deleted file mode 100644
index 7f8918613..000000000
--- a/baseconfig/x86/i686/CONFIG_NOHIGHMEM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NOHIGHMEM is not set
diff --git a/baseconfig/x86/i686/CONFIG_NR_CPUS b/baseconfig/x86/i686/CONFIG_NR_CPUS
deleted file mode 100644
index 1d82a8537..000000000
--- a/baseconfig/x86/i686/CONFIG_NR_CPUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NR_CPUS=32
diff --git a/baseconfig/x86/i686/CONFIG_NSC_GPIO b/baseconfig/x86/i686/CONFIG_NSC_GPIO
deleted file mode 100644
index ae162591d..000000000
--- a/baseconfig/x86/i686/CONFIG_NSC_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NSC_GPIO=m
diff --git a/baseconfig/x86/i686/CONFIG_NUMA b/baseconfig/x86/i686/CONFIG_NUMA
deleted file mode 100644
index 7482c9800..000000000
--- a/baseconfig/x86/i686/CONFIG_NUMA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NUMA is not set
diff --git a/baseconfig/x86/i686/CONFIG_OF b/baseconfig/x86/i686/CONFIG_OF
deleted file mode 100644
index b7345dd59..000000000
--- a/baseconfig/x86/i686/CONFIG_OF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OF=y
diff --git a/baseconfig/x86/i686/CONFIG_OF_OVERLAY b/baseconfig/x86/i686/CONFIG_OF_OVERLAY
deleted file mode 100644
index d87a96c0f..000000000
--- a/baseconfig/x86/i686/CONFIG_OF_OVERLAY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_OF_OVERLAY is not set
diff --git a/baseconfig/x86/i686/CONFIG_OF_UNITTEST b/baseconfig/x86/i686/CONFIG_OF_UNITTEST
deleted file mode 100644
index f9773f73d..000000000
--- a/baseconfig/x86/i686/CONFIG_OF_UNITTEST
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_OF_UNITTEST is not set
diff --git a/baseconfig/x86/i686/CONFIG_OLPC b/baseconfig/x86/i686/CONFIG_OLPC
deleted file mode 100644
index 83b2aa42a..000000000
--- a/baseconfig/x86/i686/CONFIG_OLPC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OLPC=y
diff --git a/baseconfig/x86/i686/CONFIG_OLPC_XO1 b/baseconfig/x86/i686/CONFIG_OLPC_XO1
deleted file mode 100644
index 3fc470286..000000000
--- a/baseconfig/x86/i686/CONFIG_OLPC_XO1
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OLPC_XO1=m
diff --git a/baseconfig/x86/i686/CONFIG_OLPC_XO15_SCI b/baseconfig/x86/i686/CONFIG_OLPC_XO15_SCI
deleted file mode 100644
index e499c0a69..000000000
--- a/baseconfig/x86/i686/CONFIG_OLPC_XO15_SCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OLPC_XO15_SCI=y
diff --git a/baseconfig/x86/i686/CONFIG_OLPC_XO1_PM b/baseconfig/x86/i686/CONFIG_OLPC_XO1_PM
deleted file mode 100644
index 3431f9ab8..000000000
--- a/baseconfig/x86/i686/CONFIG_OLPC_XO1_PM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OLPC_XO1_PM=y
diff --git a/baseconfig/x86/i686/CONFIG_OLPC_XO1_RTC b/baseconfig/x86/i686/CONFIG_OLPC_XO1_RTC
deleted file mode 100644
index 761dae209..000000000
--- a/baseconfig/x86/i686/CONFIG_OLPC_XO1_RTC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OLPC_XO1_RTC=y
diff --git a/baseconfig/x86/i686/CONFIG_OLPC_XO1_SCI b/baseconfig/x86/i686/CONFIG_OLPC_XO1_SCI
deleted file mode 100644
index 6ff71331c..000000000
--- a/baseconfig/x86/i686/CONFIG_OLPC_XO1_SCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OLPC_XO1_SCI=y
diff --git a/baseconfig/x86/i686/CONFIG_PC8736x_GPIO b/baseconfig/x86/i686/CONFIG_PC8736x_GPIO
deleted file mode 100644
index 77e0e929a..000000000
--- a/baseconfig/x86/i686/CONFIG_PC8736x_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PC8736x_GPIO=m
diff --git a/baseconfig/x86/i686/CONFIG_PCI_DIRECT b/baseconfig/x86/i686/CONFIG_PCI_DIRECT
deleted file mode 100644
index 1d4923bf1..000000000
--- a/baseconfig/x86/i686/CONFIG_PCI_DIRECT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCI_DIRECT=y
diff --git a/baseconfig/x86/i686/CONFIG_PCI_GOANY b/baseconfig/x86/i686/CONFIG_PCI_GOANY
deleted file mode 100644
index 35bc92b39..000000000
--- a/baseconfig/x86/i686/CONFIG_PCI_GOANY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCI_GOANY=y
diff --git a/baseconfig/x86/i686/CONFIG_PCI_GOBIOS b/baseconfig/x86/i686/CONFIG_PCI_GOBIOS
deleted file mode 100644
index 0bf470f25..000000000
--- a/baseconfig/x86/i686/CONFIG_PCI_GOBIOS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PCI_GOBIOS is not set
diff --git a/baseconfig/x86/i686/CONFIG_PCI_GODIRECT b/baseconfig/x86/i686/CONFIG_PCI_GODIRECT
deleted file mode 100644
index 356bcaa99..000000000
--- a/baseconfig/x86/i686/CONFIG_PCI_GODIRECT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PCI_GODIRECT is not set
diff --git a/baseconfig/x86/i686/CONFIG_PCI_GOMMCONFIG b/baseconfig/x86/i686/CONFIG_PCI_GOMMCONFIG
deleted file mode 100644
index 06d222163..000000000
--- a/baseconfig/x86/i686/CONFIG_PCI_GOMMCONFIG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PCI_GOMMCONFIG is not set
diff --git a/baseconfig/x86/i686/CONFIG_PHYSICAL_ALIGN b/baseconfig/x86/i686/CONFIG_PHYSICAL_ALIGN
deleted file mode 100644
index 593f6d5c4..000000000
--- a/baseconfig/x86/i686/CONFIG_PHYSICAL_ALIGN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHYSICAL_ALIGN=0x400000
diff --git a/baseconfig/x86/i686/CONFIG_PHYSICAL_START b/baseconfig/x86/i686/CONFIG_PHYSICAL_START
deleted file mode 100644
index 52dc8ee22..000000000
--- a/baseconfig/x86/i686/CONFIG_PHYSICAL_START
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHYSICAL_START=0x400000
diff --git a/baseconfig/x86/i686/CONFIG_PINCONF b/baseconfig/x86/i686/CONFIG_PINCONF
deleted file mode 100644
index 2f04b24a4..000000000
--- a/baseconfig/x86/i686/CONFIG_PINCONF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCONF=y
diff --git a/baseconfig/x86/i686/CONFIG_PINCTRL_SINGLE b/baseconfig/x86/i686/CONFIG_PINCTRL_SINGLE
deleted file mode 100644
index 4142920af..000000000
--- a/baseconfig/x86/i686/CONFIG_PINCTRL_SINGLE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PINCTRL_SINGLE is not set
diff --git a/baseconfig/x86/i686/CONFIG_PINMUX b/baseconfig/x86/i686/CONFIG_PINMUX
deleted file mode 100644
index 2e704c683..000000000
--- a/baseconfig/x86/i686/CONFIG_PINMUX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINMUX=y
diff --git a/baseconfig/x86/i686/CONFIG_POWER_RESET_GPIO b/baseconfig/x86/i686/CONFIG_POWER_RESET_GPIO
deleted file mode 100644
index dac784d6c..000000000
--- a/baseconfig/x86/i686/CONFIG_POWER_RESET_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_POWER_RESET_GPIO=y
diff --git a/baseconfig/x86/i686/CONFIG_POWER_RESET_GPIO_RESTART b/baseconfig/x86/i686/CONFIG_POWER_RESET_GPIO_RESTART
deleted file mode 100644
index 28e2b6125..000000000
--- a/baseconfig/x86/i686/CONFIG_POWER_RESET_GPIO_RESTART
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_POWER_RESET_GPIO_RESTART is not set
diff --git a/baseconfig/x86/i686/CONFIG_PROVIDE_OHCI1394_DMA_INIT b/baseconfig/x86/i686/CONFIG_PROVIDE_OHCI1394_DMA_INIT
deleted file mode 100644
index 494ddf49a..000000000
--- a/baseconfig/x86/i686/CONFIG_PROVIDE_OHCI1394_DMA_INIT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
diff --git a/baseconfig/x86/i686/CONFIG_RCU_FANOUT b/baseconfig/x86/i686/CONFIG_RCU_FANOUT
deleted file mode 100644
index f80f8cbe6..000000000
--- a/baseconfig/x86/i686/CONFIG_RCU_FANOUT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RCU_FANOUT=32
diff --git a/baseconfig/x86/i686/CONFIG_REGMAP_I2C b/baseconfig/x86/i686/CONFIG_REGMAP_I2C
deleted file mode 100644
index 907c212ef..000000000
--- a/baseconfig/x86/i686/CONFIG_REGMAP_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGMAP_I2C=y
diff --git a/baseconfig/x86/i686/CONFIG_SCx200 b/baseconfig/x86/i686/CONFIG_SCx200
deleted file mode 100644
index 3b69c05a7..000000000
--- a/baseconfig/x86/i686/CONFIG_SCx200
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCx200 is not set
diff --git a/baseconfig/x86/i686/CONFIG_SCx200_ACB b/baseconfig/x86/i686/CONFIG_SCx200_ACB
deleted file mode 100644
index a4434e910..000000000
--- a/baseconfig/x86/i686/CONFIG_SCx200_ACB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCx200_ACB is not set
diff --git a/baseconfig/x86/i686/CONFIG_SERIAL_8250_MID b/baseconfig/x86/i686/CONFIG_SERIAL_8250_MID
deleted file mode 100644
index 58ee08f11..000000000
--- a/baseconfig/x86/i686/CONFIG_SERIAL_8250_MID
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_8250_MID=y
diff --git a/baseconfig/x86/i686/CONFIG_SERIAL_GRLIB_GAISLER_APBUART b/baseconfig/x86/i686/CONFIG_SERIAL_GRLIB_GAISLER_APBUART
deleted file mode 100644
index a72a7dbda..000000000
--- a/baseconfig/x86/i686/CONFIG_SERIAL_GRLIB_GAISLER_APBUART
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
diff --git a/baseconfig/x86/i686/CONFIG_SERIAL_OF_PLATFORM b/baseconfig/x86/i686/CONFIG_SERIAL_OF_PLATFORM
deleted file mode 100644
index 46bc74d49..000000000
--- a/baseconfig/x86/i686/CONFIG_SERIAL_OF_PLATFORM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_OF_PLATFORM=m
diff --git a/baseconfig/x86/i686/CONFIG_SND_SOC_SSM4567 b/baseconfig/x86/i686/CONFIG_SND_SOC_SSM4567
deleted file mode 100644
index 8907aafc9..000000000
--- a/baseconfig/x86/i686/CONFIG_SND_SOC_SSM4567
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_SSM4567=m
diff --git a/baseconfig/x86/i686/CONFIG_SONYPI b/baseconfig/x86/i686/CONFIG_SONYPI
deleted file mode 100644
index ee80f74cb..000000000
--- a/baseconfig/x86/i686/CONFIG_SONYPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SONYPI=m
diff --git a/baseconfig/x86/i686/CONFIG_SONYPI_COMPAT b/baseconfig/x86/i686/CONFIG_SONYPI_COMPAT
deleted file mode 100644
index 6655c779b..000000000
--- a/baseconfig/x86/i686/CONFIG_SONYPI_COMPAT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SONYPI_COMPAT=y
diff --git a/baseconfig/x86/i686/CONFIG_SPARSE_IRQ b/baseconfig/x86/i686/CONFIG_SPARSE_IRQ
deleted file mode 100644
index 943900f63..000000000
--- a/baseconfig/x86/i686/CONFIG_SPARSE_IRQ
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPARSE_IRQ=y
diff --git a/baseconfig/x86/i686/CONFIG_STA2X11 b/baseconfig/x86/i686/CONFIG_STA2X11
deleted file mode 100644
index ee8f3f09f..000000000
--- a/baseconfig/x86/i686/CONFIG_STA2X11
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_STA2X11 is not set
diff --git a/baseconfig/x86/i686/CONFIG_SYNC_FILE b/baseconfig/x86/i686/CONFIG_SYNC_FILE
deleted file mode 100644
index 391ab547b..000000000
--- a/baseconfig/x86/i686/CONFIG_SYNC_FILE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SYNC_FILE=y
diff --git a/baseconfig/x86/i686/CONFIG_TC1100_WMI b/baseconfig/x86/i686/CONFIG_TC1100_WMI
deleted file mode 100644
index ca6002268..000000000
--- a/baseconfig/x86/i686/CONFIG_TC1100_WMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TC1100_WMI=m
diff --git a/baseconfig/x86/i686/CONFIG_TOSHIBA b/baseconfig/x86/i686/CONFIG_TOSHIBA
deleted file mode 100644
index b0cfad976..000000000
--- a/baseconfig/x86/i686/CONFIG_TOSHIBA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TOSHIBA=m
diff --git a/baseconfig/x86/i686/CONFIG_TOUCHSCREEN_AUO_PIXCIR b/baseconfig/x86/i686/CONFIG_TOUCHSCREEN_AUO_PIXCIR
deleted file mode 100644
index b33f61f37..000000000
--- a/baseconfig/x86/i686/CONFIG_TOUCHSCREEN_AUO_PIXCIR
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
diff --git a/baseconfig/x86/i686/CONFIG_TRANSPARENT_HUGEPAGE b/baseconfig/x86/i686/CONFIG_TRANSPARENT_HUGEPAGE
deleted file mode 100644
index 4874a851b..000000000
--- a/baseconfig/x86/i686/CONFIG_TRANSPARENT_HUGEPAGE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
diff --git a/baseconfig/x86/i686/CONFIG_VIDEO_CAFE_CCIC b/baseconfig/x86/i686/CONFIG_VIDEO_CAFE_CCIC
deleted file mode 100644
index f29531420..000000000
--- a/baseconfig/x86/i686/CONFIG_VIDEO_CAFE_CCIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_CAFE_CCIC=m
diff --git a/baseconfig/x86/i686/CONFIG_X86_32_IRIS b/baseconfig/x86/i686/CONFIG_X86_32_IRIS
deleted file mode 100644
index f962972e1..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_32_IRIS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_32_IRIS=m
diff --git a/baseconfig/x86/i686/CONFIG_X86_32_NON_STANDARD b/baseconfig/x86/i686/CONFIG_X86_32_NON_STANDARD
deleted file mode 100644
index 051640b41..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_32_NON_STANDARD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_32_NON_STANDARD is not set
diff --git a/baseconfig/x86/i686/CONFIG_X86_ANCIENT_MCE b/baseconfig/x86/i686/CONFIG_X86_ANCIENT_MCE
deleted file mode 100644
index 0f8514b5f..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_ANCIENT_MCE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_ANCIENT_MCE is not set
diff --git a/baseconfig/x86/i686/CONFIG_X86_BIGSMP b/baseconfig/x86/i686/CONFIG_X86_BIGSMP
deleted file mode 100644
index 80880952e..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_BIGSMP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_BIGSMP=y
diff --git a/baseconfig/x86/i686/CONFIG_X86_CPUFREQ_NFORCE2 b/baseconfig/x86/i686/CONFIG_X86_CPUFREQ_NFORCE2
deleted file mode 100644
index 6d5f101b7..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_CPUFREQ_NFORCE2
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_CPUFREQ_NFORCE2 is not set
diff --git a/baseconfig/x86/i686/CONFIG_X86_E_POWERSAVER b/baseconfig/x86/i686/CONFIG_X86_E_POWERSAVER
deleted file mode 100644
index d5fbbbb13..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_E_POWERSAVER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_E_POWERSAVER is not set
diff --git a/baseconfig/x86/i686/CONFIG_X86_GENERIC b/baseconfig/x86/i686/CONFIG_X86_GENERIC
deleted file mode 100644
index 4c1688c38..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_GENERIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_GENERIC=y
diff --git a/baseconfig/x86/i686/CONFIG_X86_GOLDFISH b/baseconfig/x86/i686/CONFIG_X86_GOLDFISH
deleted file mode 100644
index e509890ff..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_GOLDFISH
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_GOLDFISH is not set
diff --git a/baseconfig/x86/i686/CONFIG_X86_GX_SUSPMOD b/baseconfig/x86/i686/CONFIG_X86_GX_SUSPMOD
deleted file mode 100644
index 2eb3b277c..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_GX_SUSPMOD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_GX_SUSPMOD is not set
diff --git a/baseconfig/x86/i686/CONFIG_X86_INTEL_MID b/baseconfig/x86/i686/CONFIG_X86_INTEL_MID
deleted file mode 100644
index 9c338605e..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_INTEL_MID
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_INTEL_MID is not set
diff --git a/baseconfig/x86/i686/CONFIG_X86_INTEL_QUARK b/baseconfig/x86/i686/CONFIG_X86_INTEL_QUARK
deleted file mode 100644
index 735531531..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_INTEL_QUARK
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_INTEL_QUARK is not set
diff --git a/baseconfig/x86/i686/CONFIG_X86_LONGHAUL b/baseconfig/x86/i686/CONFIG_X86_LONGHAUL
deleted file mode 100644
index dfa6f6e12..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_LONGHAUL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_LONGHAUL is not set
diff --git a/baseconfig/x86/i686/CONFIG_X86_LONGRUN b/baseconfig/x86/i686/CONFIG_X86_LONGRUN
deleted file mode 100644
index 003040a51..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_LONGRUN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_LONGRUN=y
diff --git a/baseconfig/x86/i686/CONFIG_X86_POWERNOW_K6 b/baseconfig/x86/i686/CONFIG_X86_POWERNOW_K6
deleted file mode 100644
index 370dc6cfb..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_POWERNOW_K6
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_POWERNOW_K6 is not set
diff --git a/baseconfig/x86/i686/CONFIG_X86_POWERNOW_K7 b/baseconfig/x86/i686/CONFIG_X86_POWERNOW_K7
deleted file mode 100644
index 00e5189c4..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_POWERNOW_K7
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_POWERNOW_K7=y
diff --git a/baseconfig/x86/i686/CONFIG_X86_PPRO_FENCE b/baseconfig/x86/i686/CONFIG_X86_PPRO_FENCE
deleted file mode 100644
index 373382804..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_PPRO_FENCE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_PPRO_FENCE is not set
diff --git a/baseconfig/x86/i686/CONFIG_X86_RDC321X b/baseconfig/x86/i686/CONFIG_X86_RDC321X
deleted file mode 100644
index 24228b211..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_RDC321X
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_RDC321X is not set
diff --git a/baseconfig/x86/i686/CONFIG_X86_REBOOTFIXUPS b/baseconfig/x86/i686/CONFIG_X86_REBOOTFIXUPS
deleted file mode 100644
index 290af2213..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_REBOOTFIXUPS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_REBOOTFIXUPS is not set
diff --git a/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_ICH b/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_ICH
deleted file mode 100644
index bfe895f71..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_ICH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_SPEEDSTEP_ICH=y
diff --git a/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_LIB b/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_LIB
deleted file mode 100644
index 3372ad003..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_LIB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_SPEEDSTEP_LIB=y
diff --git a/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK b/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK
deleted file mode 100644
index 808ce2b1d..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
diff --git a/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_SMI b/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_SMI
deleted file mode 100644
index 1a5cd0138..000000000
--- a/baseconfig/x86/i686/CONFIG_X86_SPEEDSTEP_SMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_SPEEDSTEP_SMI=y
diff --git a/baseconfig/x86/i686/CONFIG_XO1_RFKILL b/baseconfig/x86/i686/CONFIG_XO1_RFKILL
deleted file mode 100644
index 342cadbed..000000000
--- a/baseconfig/x86/i686/CONFIG_XO1_RFKILL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XO1_RFKILL=m
diff --git a/baseconfig/x86/i686/CONFIG_ZONE_DMA b/baseconfig/x86/i686/CONFIG_ZONE_DMA
deleted file mode 100644
index c1b5f84a5..000000000
--- a/baseconfig/x86/i686/CONFIG_ZONE_DMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ZONE_DMA=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_4KSTACKS b/baseconfig/x86/i686PAE/CONFIG_4KSTACKS
deleted file mode 100644
index b3ae285eb..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_4KSTACKS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_4KSTACKS is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_64BIT b/baseconfig/x86/i686PAE/CONFIG_64BIT
deleted file mode 100644
index 2441d5a81..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_64BIT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_64BIT is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_ALIX b/baseconfig/x86/i686PAE/CONFIG_ALIX
deleted file mode 100644
index 42007a768..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_ALIX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ALIX is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_APM b/baseconfig/x86/i686PAE/CONFIG_APM
deleted file mode 100644
index ef1e73d55..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_APM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_APM=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_APM_ALLOW_INTS b/baseconfig/x86/i686PAE/CONFIG_APM_ALLOW_INTS
deleted file mode 100644
index 9a0eef313..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_APM_ALLOW_INTS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_APM_ALLOW_INTS is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_APM_CPU_IDLE b/baseconfig/x86/i686PAE/CONFIG_APM_CPU_IDLE
deleted file mode 100644
index 874064310..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_APM_CPU_IDLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_APM_CPU_IDLE=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_APM_DISPLAY_BLANK b/baseconfig/x86/i686PAE/CONFIG_APM_DISPLAY_BLANK
deleted file mode 100644
index b2909fb06..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_APM_DISPLAY_BLANK
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_APM_DISPLAY_BLANK is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_APM_DO_ENABLE b/baseconfig/x86/i686PAE/CONFIG_APM_DO_ENABLE
deleted file mode 100644
index 475553811..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_APM_DO_ENABLE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_APM_DO_ENABLE is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_APM_IGNORE_USER_SUSPEND b/baseconfig/x86/i686PAE/CONFIG_APM_IGNORE_USER_SUSPEND
deleted file mode 100644
index 45b5324a1..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_APM_IGNORE_USER_SUSPEND
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_APM_IGNORE_USER_SUSPEND is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_BACKLIGHT_OT200 b/baseconfig/x86/i686PAE/CONFIG_BACKLIGHT_OT200
deleted file mode 100644
index 7fc698fe0..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_BACKLIGHT_OT200
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BACKLIGHT_OT200 is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_BACKLIGHT_PWM b/baseconfig/x86/i686PAE/CONFIG_BACKLIGHT_PWM
deleted file mode 100644
index 44737e214..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_BACKLIGHT_PWM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BACKLIGHT_PWM=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_BATTERY_OLPC b/baseconfig/x86/i686PAE/CONFIG_BATTERY_OLPC
deleted file mode 100644
index 1270fb00f..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_BATTERY_OLPC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BATTERY_OLPC=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_AES_586 b/baseconfig/x86/i686PAE/CONFIG_CRYPTO_AES_586
deleted file mode 100644
index 4702bf09c..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_AES_586
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_AES_586=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_CRYPTD b/baseconfig/x86/i686PAE/CONFIG_CRYPTO_CRYPTD
deleted file mode 100644
index 36649cff3..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_CRYPTD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CRYPTD=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_DEV_GEODE b/baseconfig/x86/i686PAE/CONFIG_CRYPTO_DEV_GEODE
deleted file mode 100644
index 751bb8680..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_DEV_GEODE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DEV_GEODE=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_LRW b/baseconfig/x86/i686PAE/CONFIG_CRYPTO_LRW
deleted file mode 100644
index 602a90482..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_LRW
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_LRW=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_TWOFISH_586 b/baseconfig/x86/i686PAE/CONFIG_CRYPTO_TWOFISH_586
deleted file mode 100644
index 3f9979eb7..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_CRYPTO_TWOFISH_586
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_TWOFISH_586=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_CS5535_CLOCK_EVENT_SRC b/baseconfig/x86/i686PAE/CONFIG_CS5535_CLOCK_EVENT_SRC
deleted file mode 100644
index 091ab254d..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_CS5535_CLOCK_EVENT_SRC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_CS5535_MFGPT b/baseconfig/x86/i686PAE/CONFIG_CS5535_MFGPT
deleted file mode 100644
index 3699e8a4e..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_CS5535_MFGPT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CS5535_MFGPT=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_DW_DMAC_CORE b/baseconfig/x86/i686PAE/CONFIG_DW_DMAC_CORE
deleted file mode 100644
index 110558a22..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_DW_DMAC_CORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DW_DMAC_CORE=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_DW_DMAC_PCI b/baseconfig/x86/i686PAE/CONFIG_DW_DMAC_PCI
deleted file mode 100644
index 2a2239b24..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_DW_DMAC_PCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DW_DMAC_PCI=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_EDAC_AMD76X b/baseconfig/x86/i686PAE/CONFIG_EDAC_AMD76X
deleted file mode 100644
index fe5952e70..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_EDAC_AMD76X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_AMD76X=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_EDAC_E7XXX b/baseconfig/x86/i686PAE/CONFIG_EDAC_E7XXX
deleted file mode 100644
index 0322ddb69..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_EDAC_E7XXX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_E7XXX=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_EDAC_I82860 b/baseconfig/x86/i686PAE/CONFIG_EDAC_I82860
deleted file mode 100644
index 5e132db1a..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_EDAC_I82860
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_I82860=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_EDAC_I82875P b/baseconfig/x86/i686PAE/CONFIG_EDAC_I82875P
deleted file mode 100644
index dbe32d406..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_EDAC_I82875P
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_I82875P=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_EDAC_R82600 b/baseconfig/x86/i686PAE/CONFIG_EDAC_R82600
deleted file mode 100644
index 93a01e506..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_EDAC_R82600
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_R82600=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_FB_GEODE b/baseconfig/x86/i686PAE/CONFIG_FB_GEODE
deleted file mode 100644
index 0f1c77894..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_FB_GEODE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_GEODE=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_FB_GEODE_GX b/baseconfig/x86/i686PAE/CONFIG_FB_GEODE_GX
deleted file mode 100644
index 08da10775..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_FB_GEODE_GX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_GEODE_GX=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_FB_GEODE_GX1 b/baseconfig/x86/i686PAE/CONFIG_FB_GEODE_GX1
deleted file mode 100644
index 55532c98a..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_FB_GEODE_GX1
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_GEODE_GX1 is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_FB_GEODE_LX b/baseconfig/x86/i686PAE/CONFIG_FB_GEODE_LX
deleted file mode 100644
index 382bfc6e1..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_FB_GEODE_LX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_GEODE_LX=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_FB_MODE_HELPERS b/baseconfig/x86/i686PAE/CONFIG_FB_MODE_HELPERS
deleted file mode 100644
index 84f515748..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_FB_MODE_HELPERS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_MODE_HELPERS=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_FB_OLPC_DCON b/baseconfig/x86/i686PAE/CONFIG_FB_OLPC_DCON
deleted file mode 100644
index 5e1569153..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_FB_OLPC_DCON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_OLPC_DCON is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_FB_SSD1307 b/baseconfig/x86/i686PAE/CONFIG_FB_SSD1307
deleted file mode 100644
index efd995bdf..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_FB_SSD1307
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_SSD1307=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_GENERIC_PHY b/baseconfig/x86/i686PAE/CONFIG_GENERIC_PHY
deleted file mode 100644
index 40cd1a4f5..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_GENERIC_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GENERIC_PHY=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_GEODE_WDT b/baseconfig/x86/i686PAE/CONFIG_GEODE_WDT
deleted file mode 100644
index b6e9726e0..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_GEODE_WDT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GEODE_WDT=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_GEOS b/baseconfig/x86/i686PAE/CONFIG_GEOS
deleted file mode 100644
index e3c72149c..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_GEOS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GEOS is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_GPIO_74XX_MMIO b/baseconfig/x86/i686PAE/CONFIG_GPIO_74XX_MMIO
deleted file mode 100644
index b761ec18a..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_GPIO_74XX_MMIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_74XX_MMIO is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_GPIO_SCH b/baseconfig/x86/i686PAE/CONFIG_GPIO_SCH
deleted file mode 100644
index 81dcf7191..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_GPIO_SCH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GPIO_SCH=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_GPIO_SODAVILLE b/baseconfig/x86/i686PAE/CONFIG_GPIO_SODAVILLE
deleted file mode 100644
index f6c07b049..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_GPIO_SODAVILLE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_SODAVILLE is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_HIGHMEM b/baseconfig/x86/i686PAE/CONFIG_HIGHMEM
deleted file mode 100644
index ae91367ff..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_HIGHMEM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HIGHMEM=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_HIGHMEM4G b/baseconfig/x86/i686PAE/CONFIG_HIGHMEM4G
deleted file mode 100644
index a0aecc579..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_HIGHMEM4G
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_HIGHMEM4G is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_HIGHMEM64G b/baseconfig/x86/i686PAE/CONFIG_HIGHMEM64G
deleted file mode 100644
index c0fbbc172..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_HIGHMEM64G
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HIGHMEM64G=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_HIGHPTE b/baseconfig/x86/i686PAE/CONFIG_HIGHPTE
deleted file mode 100644
index e11904f2f..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_HIGHPTE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HIGHPTE=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_HOTPLUG_PCI_SHPC b/baseconfig/x86/i686PAE/CONFIG_HOTPLUG_PCI_SHPC
deleted file mode 100644
index f03be8a8f..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_HOTPLUG_PCI_SHPC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_HOTPLUG_PCI_SHPC is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_HSU_DMA b/baseconfig/x86/i686PAE/CONFIG_HSU_DMA
deleted file mode 100644
index 0dcb85dec..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_HSU_DMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HSU_DMA=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_HW_RANDOM_GEODE b/baseconfig/x86/i686PAE/CONFIG_HW_RANDOM_GEODE
deleted file mode 100644
index a8c3583f1..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_HW_RANDOM_GEODE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HW_RANDOM_GEODE=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_I2C_ALI1535 b/baseconfig/x86/i686PAE/CONFIG_I2C_ALI1535
deleted file mode 100644
index 9342b1dbc..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_I2C_ALI1535
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_ALI1535=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_I2C_ALI1563 b/baseconfig/x86/i686PAE/CONFIG_I2C_ALI1563
deleted file mode 100644
index c030320fc..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_I2C_ALI1563
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_ALI1563=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_I2C_ALI15X3 b/baseconfig/x86/i686PAE/CONFIG_I2C_ALI15X3
deleted file mode 100644
index df3fff740..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_I2C_ALI15X3
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_ALI15X3=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_I2C_MUX b/baseconfig/x86/i686PAE/CONFIG_I2C_MUX
deleted file mode 100644
index 6982ed98a..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_I2C_MUX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_MUX=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_I2C_SIS5595 b/baseconfig/x86/i686PAE/CONFIG_I2C_SIS5595
deleted file mode 100644
index 6a57af79b..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_I2C_SIS5595
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_SIS5595=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_I2C_SIS630 b/baseconfig/x86/i686PAE/CONFIG_I2C_SIS630
deleted file mode 100644
index 1eff29bc7..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_I2C_SIS630
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_SIS630=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_I2O b/baseconfig/x86/i686PAE/CONFIG_I2O
deleted file mode 100644
index c3064fb4b..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_I2O
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2O is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_IB700_WDT b/baseconfig/x86/i686PAE/CONFIG_IB700_WDT
deleted file mode 100644
index 3cf068abd..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_IB700_WDT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IB700_WDT=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_INPUT_GP2A b/baseconfig/x86/i686PAE/CONFIG_INPUT_GP2A
deleted file mode 100644
index 221036349..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_INPUT_GP2A
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_GP2A is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_INPUT_GPIO_TILT_POLLED b/baseconfig/x86/i686PAE/CONFIG_INPUT_GPIO_TILT_POLLED
deleted file mode 100644
index 8b1ef8c62..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_INPUT_GPIO_TILT_POLLED
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_GPIO_TILT_POLLED is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_INPUT_MATRIXKMAP b/baseconfig/x86/i686PAE/CONFIG_INPUT_MATRIXKMAP
deleted file mode 100644
index 0f1b2f168..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_INPUT_MATRIXKMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_MATRIXKMAP=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_INPUT_PWM_BEEPER b/baseconfig/x86/i686PAE/CONFIG_INPUT_PWM_BEEPER
deleted file mode 100644
index 59fdb225d..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_INPUT_PWM_BEEPER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_PWM_BEEPER=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_INTEL_TXT b/baseconfig/x86/i686PAE/CONFIG_INTEL_TXT
deleted file mode 100644
index 729b3644f..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_INTEL_TXT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INTEL_TXT is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_KEXEC_JUMP b/baseconfig/x86/i686PAE/CONFIG_KEXEC_JUMP
deleted file mode 100644
index ac2cebdf4..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_KEXEC_JUMP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_KEXEC_JUMP is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_KEYBOARD_BCM b/baseconfig/x86/i686PAE/CONFIG_KEYBOARD_BCM
deleted file mode 100644
index d904364b5..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_KEYBOARD_BCM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_KEYBOARD_BCM is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_LBDAF b/baseconfig/x86/i686PAE/CONFIG_LBDAF
deleted file mode 100644
index b3fae707a..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_LBDAF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LBDAF=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_LIBNVDIMM b/baseconfig/x86/i686PAE/CONFIG_LIBNVDIMM
deleted file mode 100644
index f773300dc..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_LIBNVDIMM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LIBNVDIMM=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_M486 b/baseconfig/x86/i686PAE/CONFIG_M486
deleted file mode 100644
index 63ff16ad2..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_M486
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_M486 is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_M586 b/baseconfig/x86/i686PAE/CONFIG_M586
deleted file mode 100644
index 1922a00f8..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_M586
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_M586 is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_M586MMX b/baseconfig/x86/i686PAE/CONFIG_M586MMX
deleted file mode 100644
index 56306e616..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_M586MMX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_M586MMX is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_M586TSC b/baseconfig/x86/i686PAE/CONFIG_M586TSC
deleted file mode 100644
index 5e8d7bf18..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_M586TSC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_M586TSC is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_M686 b/baseconfig/x86/i686PAE/CONFIG_M686
deleted file mode 100644
index 48ecb46e3..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_M686
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_M686=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_MATH_EMULATION b/baseconfig/x86/i686PAE/CONFIG_MATH_EMULATION
deleted file mode 100644
index be33a6a76..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MATH_EMULATION
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MATH_EMULATION is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_MCRUSOE b/baseconfig/x86/i686PAE/CONFIG_MCRUSOE
deleted file mode 100644
index de9c313b3..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MCRUSOE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MCRUSOE is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_MCYRIXIII b/baseconfig/x86/i686PAE/CONFIG_MCYRIXIII
deleted file mode 100644
index 9386b3779..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MCYRIXIII
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MCYRIXIII is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_MFD_CS5535 b/baseconfig/x86/i686PAE/CONFIG_MFD_CS5535
deleted file mode 100644
index ac2f3c2fc..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MFD_CS5535
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_CS5535=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_MK6 b/baseconfig/x86/i686PAE/CONFIG_MK6
deleted file mode 100644
index d8b023cf4..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MK6
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MK6 is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_MK7 b/baseconfig/x86/i686PAE/CONFIG_MK7
deleted file mode 100644
index 949a5f991..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MK7
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MK7 is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_MK8 b/baseconfig/x86/i686PAE/CONFIG_MK8
deleted file mode 100644
index 2f448241b..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MK8
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MK8 is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_MLX5_INFINIBAND b/baseconfig/x86/i686PAE/CONFIG_MLX5_INFINIBAND
deleted file mode 100644
index c09ba1a61..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MLX5_INFINIBAND
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MLX5_INFINIBAND is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_MOUSE_PS2_OLPC b/baseconfig/x86/i686PAE/CONFIG_MOUSE_PS2_OLPC
deleted file mode 100644
index a5a03d20c..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MOUSE_PS2_OLPC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MOUSE_PS2_OLPC=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_MPENTIUM4 b/baseconfig/x86/i686PAE/CONFIG_MPENTIUM4
deleted file mode 100644
index cebe97732..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MPENTIUM4
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MPENTIUM4 is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_MPENTIUMII b/baseconfig/x86/i686PAE/CONFIG_MPENTIUMII
deleted file mode 100644
index 10d33aec4..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MPENTIUMII
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MPENTIUMII is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_MPENTIUMIII b/baseconfig/x86/i686PAE/CONFIG_MPENTIUMIII
deleted file mode 100644
index 6a631dc84..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MPENTIUMIII
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MPENTIUMIII is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_MPENTIUMM b/baseconfig/x86/i686PAE/CONFIG_MPENTIUMM
deleted file mode 100644
index b77ce1640..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MPENTIUMM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MPENTIUMM is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_MTD_NAND_CAFE b/baseconfig/x86/i686PAE/CONFIG_MTD_NAND_CAFE
deleted file mode 100644
index ae5227871..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MTD_NAND_CAFE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_NAND_CAFE=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_MTD_OF_PARTS b/baseconfig/x86/i686PAE/CONFIG_MTD_OF_PARTS
deleted file mode 100644
index bddcc3b5e..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MTD_OF_PARTS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_OF_PARTS=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_MTD_PHYSMAP_OF b/baseconfig/x86/i686PAE/CONFIG_MTD_PHYSMAP_OF
deleted file mode 100644
index 4558beae6..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MTD_PHYSMAP_OF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_PHYSMAP_OF=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_MVIAC3_2 b/baseconfig/x86/i686PAE/CONFIG_MVIAC3_2
deleted file mode 100644
index 935c0d447..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MVIAC3_2
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MVIAC3_2 is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_MWINCHIP3D b/baseconfig/x86/i686PAE/CONFIG_MWINCHIP3D
deleted file mode 100644
index f311f90ea..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MWINCHIP3D
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MWINCHIP3D is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_MWINCHIPC6 b/baseconfig/x86/i686PAE/CONFIG_MWINCHIPC6
deleted file mode 100644
index 24e6694b4..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MWINCHIPC6
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MWINCHIPC6 is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_NET5501 b/baseconfig/x86/i686PAE/CONFIG_NET5501
deleted file mode 100644
index 3ed621992..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_NET5501
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET5501 is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_NOHIGHMEM b/baseconfig/x86/i686PAE/CONFIG_NOHIGHMEM
deleted file mode 100644
index 7f8918613..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_NOHIGHMEM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NOHIGHMEM is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_NR_CPUS b/baseconfig/x86/i686PAE/CONFIG_NR_CPUS
deleted file mode 100644
index 1d82a8537..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_NR_CPUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NR_CPUS=32
diff --git a/baseconfig/x86/i686PAE/CONFIG_NSC_GPIO b/baseconfig/x86/i686PAE/CONFIG_NSC_GPIO
deleted file mode 100644
index ae162591d..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_NSC_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NSC_GPIO=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_NUMA b/baseconfig/x86/i686PAE/CONFIG_NUMA
deleted file mode 100644
index 7482c9800..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_NUMA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NUMA is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_OF b/baseconfig/x86/i686PAE/CONFIG_OF
deleted file mode 100644
index b7345dd59..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_OF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OF=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_OF_OVERLAY b/baseconfig/x86/i686PAE/CONFIG_OF_OVERLAY
deleted file mode 100644
index d87a96c0f..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_OF_OVERLAY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_OF_OVERLAY is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_OF_UNITTEST b/baseconfig/x86/i686PAE/CONFIG_OF_UNITTEST
deleted file mode 100644
index f9773f73d..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_OF_UNITTEST
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_OF_UNITTEST is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_OLPC b/baseconfig/x86/i686PAE/CONFIG_OLPC
deleted file mode 100644
index 83b2aa42a..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_OLPC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OLPC=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1 b/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1
deleted file mode 100644
index 3fc470286..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OLPC_XO1=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO15_SCI b/baseconfig/x86/i686PAE/CONFIG_OLPC_XO15_SCI
deleted file mode 100644
index e499c0a69..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO15_SCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OLPC_XO15_SCI=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_PM b/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_PM
deleted file mode 100644
index 3431f9ab8..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_PM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OLPC_XO1_PM=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_RTC b/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_RTC
deleted file mode 100644
index 761dae209..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_RTC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OLPC_XO1_RTC=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_SCI b/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_SCI
deleted file mode 100644
index 6ff71331c..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_OLPC_XO1_SCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_OLPC_XO1_SCI=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_PC8736x_GPIO b/baseconfig/x86/i686PAE/CONFIG_PC8736x_GPIO
deleted file mode 100644
index 77e0e929a..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_PC8736x_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PC8736x_GPIO=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_PCI_DIRECT b/baseconfig/x86/i686PAE/CONFIG_PCI_DIRECT
deleted file mode 100644
index 1d4923bf1..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_PCI_DIRECT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCI_DIRECT=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_PCI_GOANY b/baseconfig/x86/i686PAE/CONFIG_PCI_GOANY
deleted file mode 100644
index 35bc92b39..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_PCI_GOANY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCI_GOANY=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_PCI_GOBIOS b/baseconfig/x86/i686PAE/CONFIG_PCI_GOBIOS
deleted file mode 100644
index 0bf470f25..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_PCI_GOBIOS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PCI_GOBIOS is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_PCI_GODIRECT b/baseconfig/x86/i686PAE/CONFIG_PCI_GODIRECT
deleted file mode 100644
index 356bcaa99..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_PCI_GODIRECT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PCI_GODIRECT is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_PCI_GOMMCONFIG b/baseconfig/x86/i686PAE/CONFIG_PCI_GOMMCONFIG
deleted file mode 100644
index 06d222163..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_PCI_GOMMCONFIG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PCI_GOMMCONFIG is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_PHYSICAL_ALIGN b/baseconfig/x86/i686PAE/CONFIG_PHYSICAL_ALIGN
deleted file mode 100644
index 593f6d5c4..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_PHYSICAL_ALIGN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHYSICAL_ALIGN=0x400000
diff --git a/baseconfig/x86/i686PAE/CONFIG_PHYSICAL_START b/baseconfig/x86/i686PAE/CONFIG_PHYSICAL_START
deleted file mode 100644
index 52dc8ee22..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_PHYSICAL_START
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHYSICAL_START=0x400000
diff --git a/baseconfig/x86/i686PAE/CONFIG_PINCONF b/baseconfig/x86/i686PAE/CONFIG_PINCONF
deleted file mode 100644
index 2f04b24a4..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_PINCONF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCONF=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_PINCTRL_SINGLE b/baseconfig/x86/i686PAE/CONFIG_PINCTRL_SINGLE
deleted file mode 100644
index 4142920af..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_PINCTRL_SINGLE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PINCTRL_SINGLE is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_PINMUX b/baseconfig/x86/i686PAE/CONFIG_PINMUX
deleted file mode 100644
index 2e704c683..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_PINMUX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINMUX=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_POWER_RESET_GPIO b/baseconfig/x86/i686PAE/CONFIG_POWER_RESET_GPIO
deleted file mode 100644
index dac784d6c..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_POWER_RESET_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_POWER_RESET_GPIO=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_POWER_RESET_GPIO_RESTART b/baseconfig/x86/i686PAE/CONFIG_POWER_RESET_GPIO_RESTART
deleted file mode 100644
index 28e2b6125..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_POWER_RESET_GPIO_RESTART
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_POWER_RESET_GPIO_RESTART is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_PROVIDE_OHCI1394_DMA_INIT b/baseconfig/x86/i686PAE/CONFIG_PROVIDE_OHCI1394_DMA_INIT
deleted file mode 100644
index 494ddf49a..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_PROVIDE_OHCI1394_DMA_INIT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_RCU_FANOUT b/baseconfig/x86/i686PAE/CONFIG_RCU_FANOUT
deleted file mode 100644
index f80f8cbe6..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_RCU_FANOUT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RCU_FANOUT=32
diff --git a/baseconfig/x86/i686PAE/CONFIG_REGMAP_I2C b/baseconfig/x86/i686PAE/CONFIG_REGMAP_I2C
deleted file mode 100644
index 907c212ef..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_REGMAP_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGMAP_I2C=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_SCx200 b/baseconfig/x86/i686PAE/CONFIG_SCx200
deleted file mode 100644
index 3b69c05a7..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_SCx200
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCx200 is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_SCx200_ACB b/baseconfig/x86/i686PAE/CONFIG_SCx200_ACB
deleted file mode 100644
index a4434e910..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_SCx200_ACB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCx200_ACB is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_SERIAL_8250_MID b/baseconfig/x86/i686PAE/CONFIG_SERIAL_8250_MID
deleted file mode 100644
index 58ee08f11..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_SERIAL_8250_MID
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_8250_MID=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_SERIAL_GRLIB_GAISLER_APBUART b/baseconfig/x86/i686PAE/CONFIG_SERIAL_GRLIB_GAISLER_APBUART
deleted file mode 100644
index a72a7dbda..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_SERIAL_GRLIB_GAISLER_APBUART
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_SERIAL_OF_PLATFORM b/baseconfig/x86/i686PAE/CONFIG_SERIAL_OF_PLATFORM
deleted file mode 100644
index 46bc74d49..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_SERIAL_OF_PLATFORM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_OF_PLATFORM=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_SND_SOC_SSM4567 b/baseconfig/x86/i686PAE/CONFIG_SND_SOC_SSM4567
deleted file mode 100644
index 8907aafc9..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_SND_SOC_SSM4567
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_SSM4567=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_SONYPI b/baseconfig/x86/i686PAE/CONFIG_SONYPI
deleted file mode 100644
index ee80f74cb..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_SONYPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SONYPI=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_SONYPI_COMPAT b/baseconfig/x86/i686PAE/CONFIG_SONYPI_COMPAT
deleted file mode 100644
index 6655c779b..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_SONYPI_COMPAT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SONYPI_COMPAT=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_SPARSE_IRQ b/baseconfig/x86/i686PAE/CONFIG_SPARSE_IRQ
deleted file mode 100644
index 943900f63..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_SPARSE_IRQ
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPARSE_IRQ=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_STA2X11 b/baseconfig/x86/i686PAE/CONFIG_STA2X11
deleted file mode 100644
index ee8f3f09f..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_STA2X11
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_STA2X11 is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_SYNC_FILE b/baseconfig/x86/i686PAE/CONFIG_SYNC_FILE
deleted file mode 100644
index 391ab547b..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_SYNC_FILE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SYNC_FILE=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_TC1100_WMI b/baseconfig/x86/i686PAE/CONFIG_TC1100_WMI
deleted file mode 100644
index ca6002268..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_TC1100_WMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TC1100_WMI=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_TOSHIBA b/baseconfig/x86/i686PAE/CONFIG_TOSHIBA
deleted file mode 100644
index b0cfad976..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_TOSHIBA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TOSHIBA=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_TOUCHSCREEN_AUO_PIXCIR b/baseconfig/x86/i686PAE/CONFIG_TOUCHSCREEN_AUO_PIXCIR
deleted file mode 100644
index b33f61f37..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_TOUCHSCREEN_AUO_PIXCIR
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_TRANSPARENT_HUGEPAGE b/baseconfig/x86/i686PAE/CONFIG_TRANSPARENT_HUGEPAGE
deleted file mode 100644
index 4874a851b..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_TRANSPARENT_HUGEPAGE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_VIDEO_CAFE_CCIC b/baseconfig/x86/i686PAE/CONFIG_VIDEO_CAFE_CCIC
deleted file mode 100644
index f29531420..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_VIDEO_CAFE_CCIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_CAFE_CCIC=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_32_IRIS b/baseconfig/x86/i686PAE/CONFIG_X86_32_IRIS
deleted file mode 100644
index f962972e1..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_32_IRIS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_32_IRIS=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_32_NON_STANDARD b/baseconfig/x86/i686PAE/CONFIG_X86_32_NON_STANDARD
deleted file mode 100644
index 051640b41..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_32_NON_STANDARD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_32_NON_STANDARD is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_ANCIENT_MCE b/baseconfig/x86/i686PAE/CONFIG_X86_ANCIENT_MCE
deleted file mode 100644
index 0f8514b5f..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_ANCIENT_MCE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_ANCIENT_MCE is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_BIGSMP b/baseconfig/x86/i686PAE/CONFIG_X86_BIGSMP
deleted file mode 100644
index 80880952e..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_BIGSMP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_BIGSMP=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_CPUFREQ_NFORCE2 b/baseconfig/x86/i686PAE/CONFIG_X86_CPUFREQ_NFORCE2
deleted file mode 100644
index 6d5f101b7..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_CPUFREQ_NFORCE2
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_CPUFREQ_NFORCE2 is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_E_POWERSAVER b/baseconfig/x86/i686PAE/CONFIG_X86_E_POWERSAVER
deleted file mode 100644
index d5fbbbb13..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_E_POWERSAVER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_E_POWERSAVER is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_GENERIC b/baseconfig/x86/i686PAE/CONFIG_X86_GENERIC
deleted file mode 100644
index 4c1688c38..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_GENERIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_GENERIC=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_GOLDFISH b/baseconfig/x86/i686PAE/CONFIG_X86_GOLDFISH
deleted file mode 100644
index e509890ff..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_GOLDFISH
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_GOLDFISH is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_GX_SUSPMOD b/baseconfig/x86/i686PAE/CONFIG_X86_GX_SUSPMOD
deleted file mode 100644
index 2eb3b277c..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_GX_SUSPMOD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_GX_SUSPMOD is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_INTEL_MID b/baseconfig/x86/i686PAE/CONFIG_X86_INTEL_MID
deleted file mode 100644
index 9c338605e..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_INTEL_MID
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_INTEL_MID is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_INTEL_QUARK b/baseconfig/x86/i686PAE/CONFIG_X86_INTEL_QUARK
deleted file mode 100644
index 735531531..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_INTEL_QUARK
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_INTEL_QUARK is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_LONGHAUL b/baseconfig/x86/i686PAE/CONFIG_X86_LONGHAUL
deleted file mode 100644
index dfa6f6e12..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_LONGHAUL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_LONGHAUL is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_LONGRUN b/baseconfig/x86/i686PAE/CONFIG_X86_LONGRUN
deleted file mode 100644
index 003040a51..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_LONGRUN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_LONGRUN=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_POWERNOW_K6 b/baseconfig/x86/i686PAE/CONFIG_X86_POWERNOW_K6
deleted file mode 100644
index 370dc6cfb..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_POWERNOW_K6
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_POWERNOW_K6 is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_POWERNOW_K7 b/baseconfig/x86/i686PAE/CONFIG_X86_POWERNOW_K7
deleted file mode 100644
index 00e5189c4..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_POWERNOW_K7
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_POWERNOW_K7=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_PPRO_FENCE b/baseconfig/x86/i686PAE/CONFIG_X86_PPRO_FENCE
deleted file mode 100644
index 373382804..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_PPRO_FENCE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_PPRO_FENCE is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_RDC321X b/baseconfig/x86/i686PAE/CONFIG_X86_RDC321X
deleted file mode 100644
index 24228b211..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_RDC321X
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_RDC321X is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_REBOOTFIXUPS b/baseconfig/x86/i686PAE/CONFIG_X86_REBOOTFIXUPS
deleted file mode 100644
index 290af2213..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_REBOOTFIXUPS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_REBOOTFIXUPS is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_ICH b/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_ICH
deleted file mode 100644
index bfe895f71..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_ICH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_SPEEDSTEP_ICH=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_LIB b/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_LIB
deleted file mode 100644
index 3372ad003..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_LIB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_SPEEDSTEP_LIB=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK b/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK
deleted file mode 100644
index 808ce2b1d..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_SMI b/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_SMI
deleted file mode 100644
index 1a5cd0138..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_X86_SPEEDSTEP_SMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_SPEEDSTEP_SMI=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_XEN_DEV_EVTCHN b/baseconfig/x86/i686PAE/CONFIG_XEN_DEV_EVTCHN
deleted file mode 100644
index a198d3b62..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_XEN_DEV_EVTCHN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_DEV_EVTCHN=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_XEN_SYS_HYPERVISOR b/baseconfig/x86/i686PAE/CONFIG_XEN_SYS_HYPERVISOR
deleted file mode 100644
index a8ff9c8e6..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_XEN_SYS_HYPERVISOR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_SYS_HYPERVISOR=y
diff --git a/baseconfig/x86/i686PAE/CONFIG_XO1_RFKILL b/baseconfig/x86/i686PAE/CONFIG_XO1_RFKILL
deleted file mode 100644
index 342cadbed..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_XO1_RFKILL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XO1_RFKILL=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_ZONE_DMA b/baseconfig/x86/i686PAE/CONFIG_ZONE_DMA
deleted file mode 100644
index c1b5f84a5..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_ZONE_DMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ZONE_DMA=y
diff --git a/baseconfig/x86/x86_64/CONFIG_64BIT b/baseconfig/x86/x86_64/CONFIG_64BIT
deleted file mode 100644
index 06a94e48b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_64BIT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_64BIT=y
diff --git a/baseconfig/x86/x86_64/CONFIG_88EU_AP_MODE b/baseconfig/x86/x86_64/CONFIG_88EU_AP_MODE
deleted file mode 100644
index 8ba98fbe9..000000000
--- a/baseconfig/x86/x86_64/CONFIG_88EU_AP_MODE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_88EU_AP_MODE=y
diff --git a/baseconfig/x86/x86_64/CONFIG_ACPI_HOTPLUG_MEMORY b/baseconfig/x86/x86_64/CONFIG_ACPI_HOTPLUG_MEMORY
deleted file mode 100644
index d2933e65f..000000000
--- a/baseconfig/x86/x86_64/CONFIG_ACPI_HOTPLUG_MEMORY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_HOTPLUG_MEMORY=y
diff --git a/baseconfig/x86/x86_64/CONFIG_ACPI_NFIT b/baseconfig/x86/x86_64/CONFIG_ACPI_NFIT
deleted file mode 100644
index 922b719bf..000000000
--- a/baseconfig/x86/x86_64/CONFIG_ACPI_NFIT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_NFIT=m
diff --git a/baseconfig/x86/x86_64/CONFIG_ACPI_NFIT_DEBUG b/baseconfig/x86/x86_64/CONFIG_ACPI_NFIT_DEBUG
deleted file mode 100644
index fc829324f..000000000
--- a/baseconfig/x86/x86_64/CONFIG_ACPI_NFIT_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ACPI_NFIT_DEBUG is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_ACPI_NUMA b/baseconfig/x86/x86_64/CONFIG_ACPI_NUMA
deleted file mode 100644
index 19881f440..000000000
--- a/baseconfig/x86/x86_64/CONFIG_ACPI_NUMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_NUMA=y
diff --git a/baseconfig/x86/x86_64/CONFIG_AK8975 b/baseconfig/x86/x86_64/CONFIG_AK8975
deleted file mode 100644
index 547c21a99..000000000
--- a/baseconfig/x86/x86_64/CONFIG_AK8975
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AK8975=m
diff --git a/baseconfig/x86/x86_64/CONFIG_AMD_IOMMU b/baseconfig/x86/x86_64/CONFIG_AMD_IOMMU
deleted file mode 100644
index ede0caaa0..000000000
--- a/baseconfig/x86/x86_64/CONFIG_AMD_IOMMU
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AMD_IOMMU=y
diff --git a/baseconfig/x86/x86_64/CONFIG_AMD_IOMMU_V2 b/baseconfig/x86/x86_64/CONFIG_AMD_IOMMU_V2
deleted file mode 100644
index bc103a7b9..000000000
--- a/baseconfig/x86/x86_64/CONFIG_AMD_IOMMU_V2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AMD_IOMMU_V2=m
diff --git a/baseconfig/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT b/baseconfig/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT
deleted file mode 100644
index f9eacfabc..000000000
--- a/baseconfig/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AMD_MEM_ENCRYPT=y
diff --git a/baseconfig/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT b/baseconfig/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
deleted file mode 100644
index e41f0cf8f..000000000
--- a/baseconfig/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_AMD_NUMA b/baseconfig/x86/x86_64/CONFIG_AMD_NUMA
deleted file mode 100644
index 2ff0db092..000000000
--- a/baseconfig/x86/x86_64/CONFIG_AMD_NUMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AMD_NUMA=y
diff --git a/baseconfig/x86/x86_64/CONFIG_AQTION b/baseconfig/x86/x86_64/CONFIG_AQTION
deleted file mode 100644
index 7812ca016..000000000
--- a/baseconfig/x86/x86_64/CONFIG_AQTION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AQTION=m
diff --git a/baseconfig/x86/x86_64/CONFIG_ARCH_MEMORY_PROBE b/baseconfig/x86/x86_64/CONFIG_ARCH_MEMORY_PROBE
deleted file mode 100644
index 9b5174506..000000000
--- a/baseconfig/x86/x86_64/CONFIG_ARCH_MEMORY_PROBE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARCH_MEMORY_PROBE is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_AXP20X_ADC b/baseconfig/x86/x86_64/CONFIG_AXP20X_ADC
deleted file mode 100644
index 0960ee661..000000000
--- a/baseconfig/x86/x86_64/CONFIG_AXP20X_ADC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_AXP20X_ADC is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_AXP20X_POWER b/baseconfig/x86/x86_64/CONFIG_AXP20X_POWER
deleted file mode 100644
index e02cee707..000000000
--- a/baseconfig/x86/x86_64/CONFIG_AXP20X_POWER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_AXP20X_POWER is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_AXP288_ADC b/baseconfig/x86/x86_64/CONFIG_AXP288_ADC
deleted file mode 100644
index e138f36af..000000000
--- a/baseconfig/x86/x86_64/CONFIG_AXP288_ADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AXP288_ADC=m
diff --git a/baseconfig/x86/x86_64/CONFIG_AXP288_CHARGER b/baseconfig/x86/x86_64/CONFIG_AXP288_CHARGER
deleted file mode 100644
index 0418f962c..000000000
--- a/baseconfig/x86/x86_64/CONFIG_AXP288_CHARGER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AXP288_CHARGER=m
diff --git a/baseconfig/x86/x86_64/CONFIG_AXP288_FUEL_GAUGE b/baseconfig/x86/x86_64/CONFIG_AXP288_FUEL_GAUGE
deleted file mode 100644
index e171b954b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_AXP288_FUEL_GAUGE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AXP288_FUEL_GAUGE=m
diff --git a/baseconfig/x86/x86_64/CONFIG_BATTERY_MAX17042 b/baseconfig/x86/x86_64/CONFIG_BATTERY_MAX17042
deleted file mode 100644
index 669e6ac2e..000000000
--- a/baseconfig/x86/x86_64/CONFIG_BATTERY_MAX17042
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BATTERY_MAX17042=m
diff --git a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CMD640 b/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CMD640
deleted file mode 100644
index 4484bcf00..000000000
--- a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CMD640
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_DEV_CMD640 is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS5520 b/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS5520
deleted file mode 100644
index 9d3d33c71..000000000
--- a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS5520
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_DEV_CS5520 is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS5530 b/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS5530
deleted file mode 100644
index 2b2e38f13..000000000
--- a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS5530
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_DEV_CS5530 is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS5535 b/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS5535
deleted file mode 100644
index a4649258c..000000000
--- a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_CS5535
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_DEV_CS5535 is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_RZ1000 b/baseconfig/x86/x86_64/CONFIG_BLK_DEV_RZ1000
deleted file mode 100644
index 60369d999..000000000
--- a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_RZ1000
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_DEV_RZ1000 is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_TRIFLEX b/baseconfig/x86/x86_64/CONFIG_BLK_DEV_TRIFLEX
deleted file mode 100644
index 1ae9f1df0..000000000
--- a/baseconfig/x86/x86_64/CONFIG_BLK_DEV_TRIFLEX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_DEV_TRIFLEX is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_BTT b/baseconfig/x86/x86_64/CONFIG_BTT
deleted file mode 100644
index 9cfddf1b9..000000000
--- a/baseconfig/x86/x86_64/CONFIG_BTT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BTT=y
diff --git a/baseconfig/x86/x86_64/CONFIG_CALGARY_IOMMU b/baseconfig/x86/x86_64/CONFIG_CALGARY_IOMMU
deleted file mode 100644
index b190f1db0..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CALGARY_IOMMU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CALGARY_IOMMU is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_CGROUP_HUGETLB b/baseconfig/x86/x86_64/CONFIG_CGROUP_HUGETLB
deleted file mode 100644
index 0e9e34b4c..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CGROUP_HUGETLB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CGROUP_HUGETLB=y
diff --git a/baseconfig/x86/x86_64/CONFIG_CHARGER_BQ24190 b/baseconfig/x86/x86_64/CONFIG_CHARGER_BQ24190
deleted file mode 100644
index 3128bb676..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CHARGER_BQ24190
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CHARGER_BQ24190=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CHECKPOINT_RESTORE b/baseconfig/x86/x86_64/CONFIG_CHECKPOINT_RESTORE
deleted file mode 100644
index c554a09ce..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CHECKPOINT_RESTORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CHECKPOINT_RESTORE=y
diff --git a/baseconfig/x86/x86_64/CONFIG_CHT_WC_PMIC_OPREGION b/baseconfig/x86/x86_64/CONFIG_CHT_WC_PMIC_OPREGION
deleted file mode 100644
index 3aa5a5f70..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CHT_WC_PMIC_OPREGION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CHT_WC_PMIC_OPREGION=y
diff --git a/baseconfig/x86/x86_64/CONFIG_CMA b/baseconfig/x86/x86_64/CONFIG_CMA
deleted file mode 100644
index 309c9e771..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CMA=y
diff --git a/baseconfig/x86/x86_64/CONFIG_CMA_AREAS b/baseconfig/x86/x86_64/CONFIG_CMA_AREAS
deleted file mode 100644
index 5474a48e9..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CMA_AREAS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CMA_AREAS=7
diff --git a/baseconfig/x86/x86_64/CONFIG_CMA_DEBUG b/baseconfig/x86/x86_64/CONFIG_CMA_DEBUG
deleted file mode 100644
index 64ff80c56..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CMA_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CMA_DEBUG is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_CMA_DEBUGFS b/baseconfig/x86/x86_64/CONFIG_CMA_DEBUGFS
deleted file mode 100644
index fba89903a..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CMA_DEBUGFS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CMA_DEBUGFS is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_CONTEXT_TRACKING_FORCE b/baseconfig/x86/x86_64/CONFIG_CONTEXT_TRACKING_FORCE
deleted file mode 100644
index 3548ba6a5..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CONTEXT_TRACKING_FORCE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CONTEXT_TRACKING_FORCE is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_AES_X86_64 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_AES_X86_64
deleted file mode 100644
index 7c09d010b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_AES_X86_64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_AES_X86_64=y
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_BLOWFISH_X86_64 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_BLOWFISH_X86_64
deleted file mode 100644
index 52bdc5fdd..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_BLOWFISH_X86_64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_BLOWFISH_X86_64=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64
deleted file mode 100644
index 67edf8dde..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64
deleted file mode 100644
index 6b7b87315..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_X86_64 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_X86_64
deleted file mode 100644
index b60b238f4..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_X86_64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CAMELLIA_X86_64=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAST5_AVX_X86_64 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAST5_AVX_X86_64
deleted file mode 100644
index a8afa374d..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAST5_AVX_X86_64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CAST5_AVX_X86_64=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAST6_AVX_X86_64 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAST6_AVX_X86_64
deleted file mode 100644
index 5dbd020a9..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CAST6_AVX_X86_64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CAST6_AVX_X86_64=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CHACHA20_X86_64 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_CHACHA20_X86_64
deleted file mode 100644
index 6131a7b56..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CHACHA20_X86_64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CHACHA20_X86_64=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CRCT10DIF_PCLMUL b/baseconfig/x86/x86_64/CONFIG_CRYPTO_CRCT10DIF_PCLMUL
deleted file mode 100644
index 14e5d708b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CRCT10DIF_PCLMUL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CRYPTD b/baseconfig/x86/x86_64/CONFIG_CRYPTO_CRYPTD
deleted file mode 100644
index 36649cff3..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_CRYPTD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CRYPTD=y
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_DES3_EDE_X86_64 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_DES3_EDE_X86_64
deleted file mode 100644
index fac68c6a1..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_DES3_EDE_X86_64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DES3_EDE_X86_64=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL b/baseconfig/x86/x86_64/CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL
deleted file mode 100644
index 3c9561aee..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_LRW b/baseconfig/x86/x86_64/CONFIG_CRYPTO_LRW
deleted file mode 100644
index 602a90482..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_LRW
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_LRW=y
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_MCRYPTD b/baseconfig/x86/x86_64/CONFIG_CRYPTO_MCRYPTD
deleted file mode 100644
index 16f3b731c..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_MCRYPTD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_MCRYPTD=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_POLY1305_X86_64 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_POLY1305_X86_64
deleted file mode 100644
index b444d2317..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_POLY1305_X86_64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_POLY1305_X86_64=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SALSA20_X86_64 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_SALSA20_X86_64
deleted file mode 100644
index 2828a82ec..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SALSA20_X86_64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_SALSA20_X86_64=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_AVX2_X86_64 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_AVX2_X86_64
deleted file mode 100644
index 604ebff65..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_AVX2_X86_64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_AVX_X86_64 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_AVX_X86_64
deleted file mode 100644
index e3ab517c6..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_AVX_X86_64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_SSE2_X86_64 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_SSE2_X86_64
deleted file mode 100644
index 6706b3873..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SERPENT_SSE2_X86_64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA1_MB b/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA1_MB
deleted file mode 100644
index 955fbbc0e..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA1_MB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CRYPTO_SHA1_MB is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA1_SSSE3 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA1_SSSE3
deleted file mode 100644
index a9dcbc3fb..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA1_SSSE3
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_SHA1_SSSE3=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA256_MB b/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA256_MB
deleted file mode 100644
index ee0f365d3..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA256_MB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_SHA256_MB=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA256_SSSE3 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA256_SSSE3
deleted file mode 100644
index 70145df43..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA256_SSSE3
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_SHA256_SSSE3=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA512_MB b/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA512_MB
deleted file mode 100644
index 8175aaafe..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA512_MB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_SHA512_MB=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3
deleted file mode 100644
index 1356b5ed4..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SHA512_SSSE3
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_SHA512_SSSE3=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SKEIN b/baseconfig/x86/x86_64/CONFIG_CRYPTO_SKEIN
deleted file mode 100644
index 74ecf1fe2..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_SKEIN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CRYPTO_SKEIN is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_AVX_X86_64 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_AVX_X86_64
deleted file mode 100644
index abdc67677..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_AVX_X86_64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_X86_64 b/baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_X86_64
deleted file mode 100644
index cf51269aa..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_X86_64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_TWOFISH_X86_64=m
diff --git a/baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_X86_64_3WAY b/baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_X86_64_3WAY
deleted file mode 100644
index 3dbb7102f..000000000
--- a/baseconfig/x86/x86_64/CONFIG_CRYPTO_TWOFISH_X86_64_3WAY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
diff --git a/baseconfig/x86/x86_64/CONFIG_DEFAULT_MMAP_MIN_ADDR b/baseconfig/x86/x86_64/CONFIG_DEFAULT_MMAP_MIN_ADDR
deleted file mode 100644
index 84b22678e..000000000
--- a/baseconfig/x86/x86_64/CONFIG_DEFAULT_MMAP_MIN_ADDR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
diff --git a/baseconfig/x86/x86_64/CONFIG_DEFERRED_STRUCT_PAGE_INIT b/baseconfig/x86/x86_64/CONFIG_DEFERRED_STRUCT_PAGE_INIT
deleted file mode 100644
index c23e98f1e..000000000
--- a/baseconfig/x86/x86_64/CONFIG_DEFERRED_STRUCT_PAGE_INIT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_DEVICE_PRIVATE b/baseconfig/x86/x86_64/CONFIG_DEVICE_PRIVATE
deleted file mode 100644
index ef0a4ad5b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_DEVICE_PRIVATE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVICE_PRIVATE=y
diff --git a/baseconfig/x86/x86_64/CONFIG_DEVICE_PUBLIC b/baseconfig/x86/x86_64/CONFIG_DEVICE_PUBLIC
deleted file mode 100644
index c790e941b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_DEVICE_PUBLIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEVICE_PUBLIC=y
diff --git a/baseconfig/x86/x86_64/CONFIG_DEV_DAX b/baseconfig/x86/x86_64/CONFIG_DEV_DAX
deleted file mode 100644
index 77478a213..000000000
--- a/baseconfig/x86/x86_64/CONFIG_DEV_DAX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEV_DAX=m
diff --git a/baseconfig/x86/x86_64/CONFIG_DEV_DAX_PMEM b/baseconfig/x86/x86_64/CONFIG_DEV_DAX_PMEM
deleted file mode 100644
index 8c7fd6732..000000000
--- a/baseconfig/x86/x86_64/CONFIG_DEV_DAX_PMEM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEV_DAX_PMEM=m
diff --git a/baseconfig/x86/x86_64/CONFIG_DIRECT_GBPAGES b/baseconfig/x86/x86_64/CONFIG_DIRECT_GBPAGES
deleted file mode 100644
index 9fef2b80b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_DIRECT_GBPAGES
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DIRECT_GBPAGES=y
diff --git a/baseconfig/x86/x86_64/CONFIG_DISCONTIGMEM_MANUAL b/baseconfig/x86/x86_64/CONFIG_DISCONTIGMEM_MANUAL
deleted file mode 100644
index ab12a7fd1..000000000
--- a/baseconfig/x86/x86_64/CONFIG_DISCONTIGMEM_MANUAL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DISCONTIGMEM_MANUAL is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_EDAC_AMD64 b/baseconfig/x86/x86_64/CONFIG_EDAC_AMD64
deleted file mode 100644
index 667e1c0ab..000000000
--- a/baseconfig/x86/x86_64/CONFIG_EDAC_AMD64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_AMD64=m
diff --git a/baseconfig/x86/x86_64/CONFIG_EDAC_AMD64_ERROR_INJECTION b/baseconfig/x86/x86_64/CONFIG_EDAC_AMD64_ERROR_INJECTION
deleted file mode 100644
index f587fd9c9..000000000
--- a/baseconfig/x86/x86_64/CONFIG_EDAC_AMD64_ERROR_INJECTION
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_EDAC_PND2 b/baseconfig/x86/x86_64/CONFIG_EDAC_PND2
deleted file mode 100644
index d0b59df60..000000000
--- a/baseconfig/x86/x86_64/CONFIG_EDAC_PND2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_PND2=m
diff --git a/baseconfig/x86/x86_64/CONFIG_EDAC_SBRIDGE b/baseconfig/x86/x86_64/CONFIG_EDAC_SBRIDGE
deleted file mode 100644
index 18dc9b53a..000000000
--- a/baseconfig/x86/x86_64/CONFIG_EDAC_SBRIDGE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_SBRIDGE=m
diff --git a/baseconfig/x86/x86_64/CONFIG_EDAC_SKX b/baseconfig/x86/x86_64/CONFIG_EDAC_SKX
deleted file mode 100644
index 33f417f1e..000000000
--- a/baseconfig/x86/x86_64/CONFIG_EDAC_SKX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_SKX=m
diff --git a/baseconfig/x86/x86_64/CONFIG_EFI_MIXED b/baseconfig/x86/x86_64/CONFIG_EFI_MIXED
deleted file mode 100644
index 3eb4a43bf..000000000
--- a/baseconfig/x86/x86_64/CONFIG_EFI_MIXED
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EFI_MIXED=y
diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON_AXP288 b/baseconfig/x86/x86_64/CONFIG_EXTCON_AXP288
deleted file mode 100644
index 7fadeb58d..000000000
--- a/baseconfig/x86/x86_64/CONFIG_EXTCON_AXP288
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXTCON_AXP288=m
diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON_INTEL_CHT_WC b/baseconfig/x86/x86_64/CONFIG_EXTCON_INTEL_CHT_WC
deleted file mode 100644
index 06e0472e8..000000000
--- a/baseconfig/x86/x86_64/CONFIG_EXTCON_INTEL_CHT_WC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXTCON_INTEL_CHT_WC=m
diff --git a/baseconfig/x86/x86_64/CONFIG_FRAME_WARN b/baseconfig/x86/x86_64/CONFIG_FRAME_WARN
deleted file mode 100644
index 6826578df..000000000
--- a/baseconfig/x86/x86_64/CONFIG_FRAME_WARN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FRAME_WARN=2048
diff --git a/baseconfig/x86/x86_64/CONFIG_FUNCTION_GRAPH_TRACER b/baseconfig/x86/x86_64/CONFIG_FUNCTION_GRAPH_TRACER
deleted file mode 100644
index b1c634d00..000000000
--- a/baseconfig/x86/x86_64/CONFIG_FUNCTION_GRAPH_TRACER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FUNCTION_GRAPH_TRACER=y
diff --git a/baseconfig/x86/x86_64/CONFIG_GART_IOMMU b/baseconfig/x86/x86_64/CONFIG_GART_IOMMU
deleted file mode 100644
index c735af30c..000000000
--- a/baseconfig/x86/x86_64/CONFIG_GART_IOMMU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GART_IOMMU is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_GENERIC_CPU b/baseconfig/x86/x86_64/CONFIG_GENERIC_CPU
deleted file mode 100644
index 9cd8d3177..000000000
--- a/baseconfig/x86/x86_64/CONFIG_GENERIC_CPU
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GENERIC_CPU=y
diff --git a/baseconfig/x86/x86_64/CONFIG_GENERIC_PHY b/baseconfig/x86/x86_64/CONFIG_GENERIC_PHY
deleted file mode 100644
index 40cd1a4f5..000000000
--- a/baseconfig/x86/x86_64/CONFIG_GENERIC_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GENERIC_PHY=y
diff --git a/baseconfig/x86/x86_64/CONFIG_GPIO_AXP209 b/baseconfig/x86/x86_64/CONFIG_GPIO_AXP209
deleted file mode 100644
index c71682292..000000000
--- a/baseconfig/x86/x86_64/CONFIG_GPIO_AXP209
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIO_AXP209 is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_HAVE_MEMORY_PRESENT b/baseconfig/x86/x86_64/CONFIG_HAVE_MEMORY_PRESENT
deleted file mode 100644
index bb00d6994..000000000
--- a/baseconfig/x86/x86_64/CONFIG_HAVE_MEMORY_PRESENT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HAVE_MEMORY_PRESENT=y
diff --git a/baseconfig/x86/x86_64/CONFIG_HFI1_DEBUG_SDMA_ORDER b/baseconfig/x86/x86_64/CONFIG_HFI1_DEBUG_SDMA_ORDER
deleted file mode 100644
index a5c5e96e6..000000000
--- a/baseconfig/x86/x86_64/CONFIG_HFI1_DEBUG_SDMA_ORDER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_HFI1_VERBS_31BIT_PSN b/baseconfig/x86/x86_64/CONFIG_HFI1_VERBS_31BIT_PSN
deleted file mode 100644
index d225cd30b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_HFI1_VERBS_31BIT_PSN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HFI1_VERBS_31BIT_PSN=y
diff --git a/baseconfig/x86/x86_64/CONFIG_HMM_MIRROR b/baseconfig/x86/x86_64/CONFIG_HMM_MIRROR
deleted file mode 100644
index 11dfee6c1..000000000
--- a/baseconfig/x86/x86_64/CONFIG_HMM_MIRROR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HMM_MIRROR=y
diff --git a/baseconfig/x86/x86_64/CONFIG_HOTPLUG_PCI_SHPC b/baseconfig/x86/x86_64/CONFIG_HOTPLUG_PCI_SHPC
deleted file mode 100644
index baec74561..000000000
--- a/baseconfig/x86/x86_64/CONFIG_HOTPLUG_PCI_SHPC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HOTPLUG_PCI_SHPC=m
diff --git a/baseconfig/x86/x86_64/CONFIG_HSA_AMD b/baseconfig/x86/x86_64/CONFIG_HSA_AMD
deleted file mode 100644
index f8e96fff1..000000000
--- a/baseconfig/x86/x86_64/CONFIG_HSA_AMD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HSA_AMD=m
diff --git a/baseconfig/x86/x86_64/CONFIG_HSU_DMA b/baseconfig/x86/x86_64/CONFIG_HSU_DMA
deleted file mode 100644
index 0dcb85dec..000000000
--- a/baseconfig/x86/x86_64/CONFIG_HSU_DMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HSU_DMA=y
diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_ALI1535 b/baseconfig/x86/x86_64/CONFIG_I2C_ALI1535
deleted file mode 100644
index 3f9e2fef1..000000000
--- a/baseconfig/x86/x86_64/CONFIG_I2C_ALI1535
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_ALI1535 is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_ALI1563 b/baseconfig/x86/x86_64/CONFIG_I2C_ALI1563
deleted file mode 100644
index 035045f8b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_I2C_ALI1563
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_ALI1563 is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_ALI15X3 b/baseconfig/x86/x86_64/CONFIG_I2C_ALI15X3
deleted file mode 100644
index 1621ea381..000000000
--- a/baseconfig/x86/x86_64/CONFIG_I2C_ALI15X3
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_ALI15X3 is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_CHT_WC b/baseconfig/x86/x86_64/CONFIG_I2C_CHT_WC
deleted file mode 100644
index f656e03fc..000000000
--- a/baseconfig/x86/x86_64/CONFIG_I2C_CHT_WC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_CHT_WC=m
diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_PCI b/baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_PCI
deleted file mode 100644
index 6103f947e..000000000
--- a/baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_PCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_DESIGNWARE_PCI=y
diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_MUX b/baseconfig/x86/x86_64/CONFIG_I2C_MUX
deleted file mode 100644
index 6982ed98a..000000000
--- a/baseconfig/x86/x86_64/CONFIG_I2C_MUX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C_MUX=m
diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_SIS5595 b/baseconfig/x86/x86_64/CONFIG_I2C_SIS5595
deleted file mode 100644
index 881262cd6..000000000
--- a/baseconfig/x86/x86_64/CONFIG_I2C_SIS5595
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_SIS5595 is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_SIS630 b/baseconfig/x86/x86_64/CONFIG_I2C_SIS630
deleted file mode 100644
index daa589151..000000000
--- a/baseconfig/x86/x86_64/CONFIG_I2C_SIS630
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_SIS630 is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_I7300_IDLE b/baseconfig/x86/x86_64/CONFIG_I7300_IDLE
deleted file mode 100644
index a4de12698..000000000
--- a/baseconfig/x86/x86_64/CONFIG_I7300_IDLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I7300_IDLE=m
diff --git a/baseconfig/x86/x86_64/CONFIG_IA32_AOUT b/baseconfig/x86/x86_64/CONFIG_IA32_AOUT
deleted file mode 100644
index 4b8545de7..000000000
--- a/baseconfig/x86/x86_64/CONFIG_IA32_AOUT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IA32_AOUT is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_IA32_EMULATION b/baseconfig/x86/x86_64/CONFIG_IA32_EMULATION
deleted file mode 100644
index 66c73dad0..000000000
--- a/baseconfig/x86/x86_64/CONFIG_IA32_EMULATION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IA32_EMULATION=y
diff --git a/baseconfig/x86/x86_64/CONFIG_INFINIBAND_HFI1 b/baseconfig/x86/x86_64/CONFIG_INFINIBAND_HFI1
deleted file mode 100644
index eb333c845..000000000
--- a/baseconfig/x86/x86_64/CONFIG_INFINIBAND_HFI1
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INFINIBAND_HFI1=m
diff --git a/baseconfig/x86/x86_64/CONFIG_INFINIBAND_OPA_VNIC b/baseconfig/x86/x86_64/CONFIG_INFINIBAND_OPA_VNIC
deleted file mode 100644
index d79565e48..000000000
--- a/baseconfig/x86/x86_64/CONFIG_INFINIBAND_OPA_VNIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INFINIBAND_OPA_VNIC=m
diff --git a/baseconfig/x86/x86_64/CONFIG_INPUT_AXP20X_PEK b/baseconfig/x86/x86_64/CONFIG_INPUT_AXP20X_PEK
deleted file mode 100644
index e2fbdf907..000000000
--- a/baseconfig/x86/x86_64/CONFIG_INPUT_AXP20X_PEK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_AXP20X_PEK=m
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_INT0002_VGPIO b/baseconfig/x86/x86_64/CONFIG_INTEL_INT0002_VGPIO
deleted file mode 100644
index 7ab08bb0e..000000000
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_INT0002_VGPIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_INT0002_VGPIO=m
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_ISH_HID b/baseconfig/x86/x86_64/CONFIG_INTEL_ISH_HID
deleted file mode 100644
index 7f7cbea0a..000000000
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_ISH_HID
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_ISH_HID=m
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_BUS b/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_BUS
deleted file mode 100644
index 0d018fbf4..000000000
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_BUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_MIC_BUS=m
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_CARD b/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_CARD
deleted file mode 100644
index ce7cbb77a..000000000
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_CARD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_MIC_CARD=m
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_HOST b/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_HOST
deleted file mode 100644
index 26e9b3ccf..000000000
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_HOST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_MIC_HOST=m
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_X100_DMA b/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_X100_DMA
deleted file mode 100644
index df573d1ab..000000000
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_MIC_X100_DMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_MIC_X100_DMA=m
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_SCU_IPC b/baseconfig/x86/x86_64/CONFIG_INTEL_SCU_IPC
deleted file mode 100644
index e535aec5b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_SCU_IPC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INTEL_SCU_IPC is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_SOC_PMIC_CHTWC b/baseconfig/x86/x86_64/CONFIG_INTEL_SOC_PMIC_CHTWC
deleted file mode 100644
index 2f8920510..000000000
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_SOC_PMIC_CHTWC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_SOC_PMIC_CHTWC=y
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_TURBO_MAX_3 b/baseconfig/x86/x86_64/CONFIG_INTEL_TURBO_MAX_3
deleted file mode 100644
index 9516cd8f6..000000000
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_TURBO_MAX_3
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_TURBO_MAX_3=y
diff --git a/baseconfig/x86/x86_64/CONFIG_INTEL_TXT b/baseconfig/x86/x86_64/CONFIG_INTEL_TXT
deleted file mode 100644
index f5428a4eb..000000000
--- a/baseconfig/x86/x86_64/CONFIG_INTEL_TXT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_TXT=y
diff --git a/baseconfig/x86/x86_64/CONFIG_INV_MPU6050_I2C b/baseconfig/x86/x86_64/CONFIG_INV_MPU6050_I2C
deleted file mode 100644
index 8ec049b05..000000000
--- a/baseconfig/x86/x86_64/CONFIG_INV_MPU6050_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INV_MPU6050_I2C=m
diff --git a/baseconfig/x86/x86_64/CONFIG_INV_MPU6050_IIO b/baseconfig/x86/x86_64/CONFIG_INV_MPU6050_IIO
deleted file mode 100644
index ae4889d92..000000000
--- a/baseconfig/x86/x86_64/CONFIG_INV_MPU6050_IIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INV_MPU6050_IIO=m
diff --git a/baseconfig/x86/x86_64/CONFIG_IOMMU_DEBUG b/baseconfig/x86/x86_64/CONFIG_IOMMU_DEBUG
deleted file mode 100644
index aa0d301b9..000000000
--- a/baseconfig/x86/x86_64/CONFIG_IOMMU_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IOMMU_DEBUG is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_IRQ_REMAP b/baseconfig/x86/x86_64/CONFIG_IRQ_REMAP
deleted file mode 100644
index dfe559c5e..000000000
--- a/baseconfig/x86/x86_64/CONFIG_IRQ_REMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IRQ_REMAP=y
diff --git a/baseconfig/x86/x86_64/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG b/baseconfig/x86/x86_64/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG
deleted file mode 100644
index e74074065..000000000
--- a/baseconfig/x86/x86_64/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
diff --git a/baseconfig/x86/x86_64/CONFIG_KEXEC_FILE b/baseconfig/x86/x86_64/CONFIG_KEXEC_FILE
deleted file mode 100644
index 25862bf98..000000000
--- a/baseconfig/x86/x86_64/CONFIG_KEXEC_FILE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEXEC_FILE=y
diff --git a/baseconfig/x86/x86_64/CONFIG_KEXEC_JUMP b/baseconfig/x86/x86_64/CONFIG_KEXEC_JUMP
deleted file mode 100644
index e87b72ed1..000000000
--- a/baseconfig/x86/x86_64/CONFIG_KEXEC_JUMP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEXEC_JUMP=y
diff --git a/baseconfig/x86/x86_64/CONFIG_KEXEC_VERIFY_SIG b/baseconfig/x86/x86_64/CONFIG_KEXEC_VERIFY_SIG
deleted file mode 100644
index 5f39f1993..000000000
--- a/baseconfig/x86/x86_64/CONFIG_KEXEC_VERIFY_SIG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KEXEC_VERIFY_SIG=y
diff --git a/baseconfig/x86/x86_64/CONFIG_LIBNVDIMM b/baseconfig/x86/x86_64/CONFIG_LIBNVDIMM
deleted file mode 100644
index f773300dc..000000000
--- a/baseconfig/x86/x86_64/CONFIG_LIBNVDIMM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LIBNVDIMM=y
diff --git a/baseconfig/x86/x86_64/CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT b/baseconfig/x86/x86_64/CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT
deleted file mode 100644
index 4a06cfcc2..000000000
--- a/baseconfig/x86/x86_64/CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
diff --git a/baseconfig/x86/x86_64/CONFIG_MAILBOX b/baseconfig/x86/x86_64/CONFIG_MAILBOX
deleted file mode 100644
index f1a6342b4..000000000
--- a/baseconfig/x86/x86_64/CONFIG_MAILBOX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MAILBOX=y
diff --git a/baseconfig/x86/x86_64/CONFIG_MEMORY_HOTPLUG b/baseconfig/x86/x86_64/CONFIG_MEMORY_HOTPLUG
deleted file mode 100644
index ff75139e0..000000000
--- a/baseconfig/x86/x86_64/CONFIG_MEMORY_HOTPLUG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MEMORY_HOTPLUG=y
diff --git a/baseconfig/x86/x86_64/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE b/baseconfig/x86/x86_64/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
deleted file mode 100644
index bbbf7d364..000000000
--- a/baseconfig/x86/x86_64/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
diff --git a/baseconfig/x86/x86_64/CONFIG_MEMORY_HOTREMOVE b/baseconfig/x86/x86_64/CONFIG_MEMORY_HOTREMOVE
deleted file mode 100644
index 362150e69..000000000
--- a/baseconfig/x86/x86_64/CONFIG_MEMORY_HOTREMOVE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MEMORY_HOTREMOVE=y
diff --git a/baseconfig/x86/x86_64/CONFIG_MEM_SOFT_DIRTY b/baseconfig/x86/x86_64/CONFIG_MEM_SOFT_DIRTY
deleted file mode 100644
index 356f2edd8..000000000
--- a/baseconfig/x86/x86_64/CONFIG_MEM_SOFT_DIRTY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MEM_SOFT_DIRTY=y
diff --git a/baseconfig/x86/x86_64/CONFIG_MFD_AXP20X b/baseconfig/x86/x86_64/CONFIG_MFD_AXP20X
deleted file mode 100644
index ada79c0d1..000000000
--- a/baseconfig/x86/x86_64/CONFIG_MFD_AXP20X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_AXP20X=y
diff --git a/baseconfig/x86/x86_64/CONFIG_MFD_AXP20X_I2C b/baseconfig/x86/x86_64/CONFIG_MFD_AXP20X_I2C
deleted file mode 100644
index 22c60295b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_MFD_AXP20X_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_AXP20X_I2C=y
diff --git a/baseconfig/x86/x86_64/CONFIG_MIC_COSM b/baseconfig/x86/x86_64/CONFIG_MIC_COSM
deleted file mode 100644
index 826edffcd..000000000
--- a/baseconfig/x86/x86_64/CONFIG_MIC_COSM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MIC_COSM=m
diff --git a/baseconfig/x86/x86_64/CONFIG_MK8 b/baseconfig/x86/x86_64/CONFIG_MK8
deleted file mode 100644
index 2f448241b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_MK8
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MK8 is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_MLX_PLATFORM b/baseconfig/x86/x86_64/CONFIG_MLX_PLATFORM
deleted file mode 100644
index 54e7906ec..000000000
--- a/baseconfig/x86/x86_64/CONFIG_MLX_PLATFORM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MLX_PLATFORM=m
diff --git a/baseconfig/x86/x86_64/CONFIG_MOVABLE_NODE b/baseconfig/x86/x86_64/CONFIG_MOVABLE_NODE
deleted file mode 100644
index 375308c7f..000000000
--- a/baseconfig/x86/x86_64/CONFIG_MOVABLE_NODE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MOVABLE_NODE is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_MPSC b/baseconfig/x86/x86_64/CONFIG_MPSC
deleted file mode 100644
index 8993bc823..000000000
--- a/baseconfig/x86/x86_64/CONFIG_MPSC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MPSC is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_MTD_BLKDEVS b/baseconfig/x86/x86_64/CONFIG_MTD_BLKDEVS
deleted file mode 100644
index b59074744..000000000
--- a/baseconfig/x86/x86_64/CONFIG_MTD_BLKDEVS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_BLKDEVS=m
diff --git a/baseconfig/x86/x86_64/CONFIG_MTD_BLOCK b/baseconfig/x86/x86_64/CONFIG_MTD_BLOCK
deleted file mode 100644
index 74f992fda..000000000
--- a/baseconfig/x86/x86_64/CONFIG_MTD_BLOCK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_BLOCK=m
diff --git a/baseconfig/x86/x86_64/CONFIG_ND_BLK b/baseconfig/x86/x86_64/CONFIG_ND_BLK
deleted file mode 100644
index 8a6c237d7..000000000
--- a/baseconfig/x86/x86_64/CONFIG_ND_BLK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ND_BLK=m
diff --git a/baseconfig/x86/x86_64/CONFIG_ND_BTT b/baseconfig/x86/x86_64/CONFIG_ND_BTT
deleted file mode 100644
index d4e20e237..000000000
--- a/baseconfig/x86/x86_64/CONFIG_ND_BTT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ND_BTT=m
diff --git a/baseconfig/x86/x86_64/CONFIG_ND_PFN b/baseconfig/x86/x86_64/CONFIG_ND_PFN
deleted file mode 100644
index 8dd69e19b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_ND_PFN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ND_PFN=m
diff --git a/baseconfig/x86/x86_64/CONFIG_NODES_SHIFT b/baseconfig/x86/x86_64/CONFIG_NODES_SHIFT
deleted file mode 100644
index abdee2f53..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NODES_SHIFT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NODES_SHIFT=10
diff --git a/baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL b/baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL
deleted file mode 100644
index 4cd3ab9ec..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NO_HZ_FULL=y
diff --git a/baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL_ALL b/baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL_ALL
deleted file mode 100644
index eddf5c467..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL_ALL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NO_HZ_FULL_ALL is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL_SYSIDLE b/baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL_SYSIDLE
deleted file mode 100644
index c8aa224ab..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NO_HZ_FULL_SYSIDLE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NO_HZ_FULL_SYSIDLE is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_NO_HZ_IDLE b/baseconfig/x86/x86_64/CONFIG_NO_HZ_IDLE
deleted file mode 100644
index 8641a52f7..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NO_HZ_IDLE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NO_HZ_IDLE is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_NR_CPUS b/baseconfig/x86/x86_64/CONFIG_NR_CPUS
deleted file mode 100644
index 27d187f4d..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NR_CPUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NR_CPUS=1024
diff --git a/baseconfig/x86/x86_64/CONFIG_NTB b/baseconfig/x86/x86_64/CONFIG_NTB
deleted file mode 100644
index f9d9791f4..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NTB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NTB=m
diff --git a/baseconfig/x86/x86_64/CONFIG_NTB_AMD b/baseconfig/x86/x86_64/CONFIG_NTB_AMD
deleted file mode 100644
index 25197ef36..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NTB_AMD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NTB_AMD=m
diff --git a/baseconfig/x86/x86_64/CONFIG_NTB_INTEL b/baseconfig/x86/x86_64/CONFIG_NTB_INTEL
deleted file mode 100644
index 9089b0cc6..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NTB_INTEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NTB_INTEL=m
diff --git a/baseconfig/x86/x86_64/CONFIG_NTB_NETDEV b/baseconfig/x86/x86_64/CONFIG_NTB_NETDEV
deleted file mode 100644
index b0a30584b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NTB_NETDEV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NTB_NETDEV=m
diff --git a/baseconfig/x86/x86_64/CONFIG_NTB_PERF b/baseconfig/x86/x86_64/CONFIG_NTB_PERF
deleted file mode 100644
index d0a76da66..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NTB_PERF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NTB_PERF=m
diff --git a/baseconfig/x86/x86_64/CONFIG_NTB_PINGPONG b/baseconfig/x86/x86_64/CONFIG_NTB_PINGPONG
deleted file mode 100644
index e797285a7..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NTB_PINGPONG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NTB_PINGPONG=m
diff --git a/baseconfig/x86/x86_64/CONFIG_NTB_TOOL b/baseconfig/x86/x86_64/CONFIG_NTB_TOOL
deleted file mode 100644
index 71fb00278..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NTB_TOOL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NTB_TOOL=m
diff --git a/baseconfig/x86/x86_64/CONFIG_NTB_TRANSPORT b/baseconfig/x86/x86_64/CONFIG_NTB_TRANSPORT
deleted file mode 100644
index ce0c040fa..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NTB_TRANSPORT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NTB_TRANSPORT=m
diff --git a/baseconfig/x86/x86_64/CONFIG_NUMA b/baseconfig/x86/x86_64/CONFIG_NUMA
deleted file mode 100644
index e480f0c04..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NUMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NUMA=y
diff --git a/baseconfig/x86/x86_64/CONFIG_NUMA_BALANCING b/baseconfig/x86/x86_64/CONFIG_NUMA_BALANCING
deleted file mode 100644
index 9de89d51d..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NUMA_BALANCING
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NUMA_BALANCING=y
diff --git a/baseconfig/x86/x86_64/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED b/baseconfig/x86/x86_64/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
deleted file mode 100644
index 5f7402180..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
diff --git a/baseconfig/x86/x86_64/CONFIG_NUMA_EMU b/baseconfig/x86/x86_64/CONFIG_NUMA_EMU
deleted file mode 100644
index 510bfc0a6..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NUMA_EMU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NUMA_EMU is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_NVDIMM_DAX b/baseconfig/x86/x86_64/CONFIG_NVDIMM_DAX
deleted file mode 100644
index 947636ca8..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NVDIMM_DAX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NVDIMM_DAX=y
diff --git a/baseconfig/x86/x86_64/CONFIG_NVDIMM_PFN b/baseconfig/x86/x86_64/CONFIG_NVDIMM_PFN
deleted file mode 100644
index 9db164ae5..000000000
--- a/baseconfig/x86/x86_64/CONFIG_NVDIMM_PFN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NVDIMM_PFN=y
diff --git a/baseconfig/x86/x86_64/CONFIG_OF b/baseconfig/x86/x86_64/CONFIG_OF
deleted file mode 100644
index d15176e9c..000000000
--- a/baseconfig/x86/x86_64/CONFIG_OF
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_OF is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_PC8736x_GPIO b/baseconfig/x86/x86_64/CONFIG_PC8736x_GPIO
deleted file mode 100644
index a7a547640..000000000
--- a/baseconfig/x86/x86_64/CONFIG_PC8736x_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PC8736x_GPIO is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_PHYSICAL_ALIGN b/baseconfig/x86/x86_64/CONFIG_PHYSICAL_ALIGN
deleted file mode 100644
index 6a12c860e..000000000
--- a/baseconfig/x86/x86_64/CONFIG_PHYSICAL_ALIGN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHYSICAL_ALIGN=0x1000000
diff --git a/baseconfig/x86/x86_64/CONFIG_PHYSICAL_START b/baseconfig/x86/x86_64/CONFIG_PHYSICAL_START
deleted file mode 100644
index 197ff1f91..000000000
--- a/baseconfig/x86/x86_64/CONFIG_PHYSICAL_START
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHYSICAL_START=0x1000000
diff --git a/baseconfig/x86/x86_64/CONFIG_PINCONF b/baseconfig/x86/x86_64/CONFIG_PINCONF
deleted file mode 100644
index 2f04b24a4..000000000
--- a/baseconfig/x86/x86_64/CONFIG_PINCONF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCONF=y
diff --git a/baseconfig/x86/x86_64/CONFIG_PINMUX b/baseconfig/x86/x86_64/CONFIG_PINMUX
deleted file mode 100644
index 2e704c683..000000000
--- a/baseconfig/x86/x86_64/CONFIG_PINMUX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINMUX=y
diff --git a/baseconfig/x86/x86_64/CONFIG_PROVIDE_OHCI1394_DMA_INIT b/baseconfig/x86/x86_64/CONFIG_PROVIDE_OHCI1394_DMA_INIT
deleted file mode 100644
index eee4011e1..000000000
--- a/baseconfig/x86/x86_64/CONFIG_PROVIDE_OHCI1394_DMA_INIT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
diff --git a/baseconfig/x86/x86_64/CONFIG_R8188EU b/baseconfig/x86/x86_64/CONFIG_R8188EU
deleted file mode 100644
index ed7c3546e..000000000
--- a/baseconfig/x86/x86_64/CONFIG_R8188EU
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_R8188EU=m
diff --git a/baseconfig/x86/x86_64/CONFIG_RANDOMIZE_MEMORY b/baseconfig/x86/x86_64/CONFIG_RANDOMIZE_MEMORY
deleted file mode 100644
index cb4fdaaac..000000000
--- a/baseconfig/x86/x86_64/CONFIG_RANDOMIZE_MEMORY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RANDOMIZE_MEMORY=y
diff --git a/baseconfig/x86/x86_64/CONFIG_RCU_FANOUT b/baseconfig/x86/x86_64/CONFIG_RCU_FANOUT
deleted file mode 100644
index e95447c12..000000000
--- a/baseconfig/x86/x86_64/CONFIG_RCU_FANOUT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RCU_FANOUT=64
diff --git a/baseconfig/x86/x86_64/CONFIG_REGMAP_I2C b/baseconfig/x86/x86_64/CONFIG_REGMAP_I2C
deleted file mode 100644
index 907c212ef..000000000
--- a/baseconfig/x86/x86_64/CONFIG_REGMAP_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGMAP_I2C=y
diff --git a/baseconfig/x86/x86_64/CONFIG_SCIF b/baseconfig/x86/x86_64/CONFIG_SCIF
deleted file mode 100644
index 74fab5182..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SCIF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCIF=m
diff --git a/baseconfig/x86/x86_64/CONFIG_SCIF_BUS b/baseconfig/x86/x86_64/CONFIG_SCIF_BUS
deleted file mode 100644
index 054e08ed2..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SCIF_BUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCIF_BUS=m
diff --git a/baseconfig/x86/x86_64/CONFIG_SDMA_VERBOSITY b/baseconfig/x86/x86_64/CONFIG_SDMA_VERBOSITY
deleted file mode 100644
index 1144ca928..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SDMA_VERBOSITY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SDMA_VERBOSITY is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_SERIAL_8250_MID b/baseconfig/x86/x86_64/CONFIG_SERIAL_8250_MID
deleted file mode 100644
index 58ee08f11..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SERIAL_8250_MID
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_8250_MID=y
diff --git a/baseconfig/x86/x86_64/CONFIG_SFC b/baseconfig/x86/x86_64/CONFIG_SFC
deleted file mode 100644
index dd76039a1..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SFC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SFC=m
diff --git a/baseconfig/x86/x86_64/CONFIG_SFC_MCDI_LOGGING b/baseconfig/x86/x86_64/CONFIG_SFC_MCDI_LOGGING
deleted file mode 100644
index d9b61520e..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SFC_MCDI_LOGGING
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SFC_MCDI_LOGGING is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_SFC_MCDI_MON b/baseconfig/x86/x86_64/CONFIG_SFC_MCDI_MON
deleted file mode 100644
index 5bb40eaea..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SFC_MCDI_MON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SFC_MCDI_MON=y
diff --git a/baseconfig/x86/x86_64/CONFIG_SFC_MTD b/baseconfig/x86/x86_64/CONFIG_SFC_MTD
deleted file mode 100644
index 35ab623c5..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SFC_MTD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SFC_MTD=y
diff --git a/baseconfig/x86/x86_64/CONFIG_SFC_SRIOV b/baseconfig/x86/x86_64/CONFIG_SFC_SRIOV
deleted file mode 100644
index 62e41fa84..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SFC_SRIOV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SFC_SRIOV=y
diff --git a/baseconfig/x86/x86_64/CONFIG_SGI_GRU b/baseconfig/x86/x86_64/CONFIG_SGI_GRU
deleted file mode 100644
index 5b133b268..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SGI_GRU
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SGI_GRU=m
diff --git a/baseconfig/x86/x86_64/CONFIG_SGI_GRU_DEBUG b/baseconfig/x86/x86_64/CONFIG_SGI_GRU_DEBUG
deleted file mode 100644
index 5e65cd5dd..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SGI_GRU_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SGI_GRU_DEBUG is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_SGI_IOC4 b/baseconfig/x86/x86_64/CONFIG_SGI_IOC4
deleted file mode 100644
index 89b268e91..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SGI_IOC4
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SGI_IOC4=m
diff --git a/baseconfig/x86/x86_64/CONFIG_SGI_XP b/baseconfig/x86/x86_64/CONFIG_SGI_XP
deleted file mode 100644
index c27ee782f..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SGI_XP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SGI_XP=m
diff --git a/baseconfig/x86/x86_64/CONFIG_SILEAD_DMI b/baseconfig/x86/x86_64/CONFIG_SILEAD_DMI
deleted file mode 100644
index 25b017354..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SILEAD_DMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SILEAD_DMI=y
diff --git a/baseconfig/x86/x86_64/CONFIG_SND_SOC_SSM4567 b/baseconfig/x86/x86_64/CONFIG_SND_SOC_SSM4567
deleted file mode 100644
index 8907aafc9..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SND_SOC_SSM4567
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_SSM4567=m
diff --git a/baseconfig/x86/x86_64/CONFIG_SPARSEMEM b/baseconfig/x86/x86_64/CONFIG_SPARSEMEM
deleted file mode 100644
index 04c45b450..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SPARSEMEM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPARSEMEM=y
diff --git a/baseconfig/x86/x86_64/CONFIG_SPARSEMEM_EXTREME b/baseconfig/x86/x86_64/CONFIG_SPARSEMEM_EXTREME
deleted file mode 100644
index 0e87090ab..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SPARSEMEM_EXTREME
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPARSEMEM_EXTREME=y
diff --git a/baseconfig/x86/x86_64/CONFIG_SPARSEMEM_MANUAL b/baseconfig/x86/x86_64/CONFIG_SPARSEMEM_MANUAL
deleted file mode 100644
index 1a32bf7cd..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SPARSEMEM_MANUAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPARSEMEM_MANUAL=y
diff --git a/baseconfig/x86/x86_64/CONFIG_SPARSEMEM_VMEMMAP b/baseconfig/x86/x86_64/CONFIG_SPARSEMEM_VMEMMAP
deleted file mode 100644
index a2826dacd..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SPARSEMEM_VMEMMAP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPARSEMEM_VMEMMAP=y
diff --git a/baseconfig/x86/x86_64/CONFIG_SPARSE_IRQ b/baseconfig/x86/x86_64/CONFIG_SPARSE_IRQ
deleted file mode 100644
index 943900f63..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SPARSE_IRQ
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPARSE_IRQ=y
diff --git a/baseconfig/x86/x86_64/CONFIG_SWIOTLB b/baseconfig/x86/x86_64/CONFIG_SWIOTLB
deleted file mode 100644
index 5405b65b4..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SWIOTLB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SWIOTLB=y
diff --git a/baseconfig/x86/x86_64/CONFIG_SYNC_FILE b/baseconfig/x86/x86_64/CONFIG_SYNC_FILE
deleted file mode 100644
index 391ab547b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SYNC_FILE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SYNC_FILE=y
diff --git a/baseconfig/x86/x86_64/CONFIG_THUNDERBOLT b/baseconfig/x86/x86_64/CONFIG_THUNDERBOLT
deleted file mode 100644
index 12b8cdd76..000000000
--- a/baseconfig/x86/x86_64/CONFIG_THUNDERBOLT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THUNDERBOLT=m
diff --git a/baseconfig/x86/x86_64/CONFIG_TRANSPARENT_HUGEPAGE b/baseconfig/x86/x86_64/CONFIG_TRANSPARENT_HUGEPAGE
deleted file mode 100644
index 75d999c66..000000000
--- a/baseconfig/x86/x86_64/CONFIG_TRANSPARENT_HUGEPAGE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TRANSPARENT_HUGEPAGE=y
diff --git a/baseconfig/x86/x86_64/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE b/baseconfig/x86/x86_64/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE
deleted file mode 100644
index f9a942f2c..000000000
--- a/baseconfig/x86/x86_64/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
diff --git a/baseconfig/x86/x86_64/CONFIG_USB_XHCI_PLATFORM b/baseconfig/x86/x86_64/CONFIG_USB_XHCI_PLATFORM
deleted file mode 100644
index 060ebfc94..000000000
--- a/baseconfig/x86/x86_64/CONFIG_USB_XHCI_PLATFORM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_XHCI_PLATFORM=m
diff --git a/baseconfig/x86/x86_64/CONFIG_UV_MMTIMER b/baseconfig/x86/x86_64/CONFIG_UV_MMTIMER
deleted file mode 100644
index 93fe2251b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_UV_MMTIMER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_UV_MMTIMER=m
diff --git a/baseconfig/x86/x86_64/CONFIG_VIDEO_CAFE_CCIC b/baseconfig/x86/x86_64/CONFIG_VIDEO_CAFE_CCIC
deleted file mode 100644
index 7f70560cf..000000000
--- a/baseconfig/x86/x86_64/CONFIG_VIDEO_CAFE_CCIC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_VIDEO_CAFE_CCIC is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_VMAP_STACK b/baseconfig/x86/x86_64/CONFIG_VMAP_STACK
deleted file mode 100644
index 8bd986875..000000000
--- a/baseconfig/x86/x86_64/CONFIG_VMAP_STACK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VMAP_STACK=y
diff --git a/baseconfig/x86/x86_64/CONFIG_VOP b/baseconfig/x86/x86_64/CONFIG_VOP
deleted file mode 100644
index 3f6192e2b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_VOP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VOP=m
diff --git a/baseconfig/x86/x86_64/CONFIG_VOP_BUS b/baseconfig/x86/x86_64/CONFIG_VOP_BUS
deleted file mode 100644
index 83c12391b..000000000
--- a/baseconfig/x86/x86_64/CONFIG_VOP_BUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VOP_BUS=m
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_5LEVEL b/baseconfig/x86/x86_64/CONFIG_X86_5LEVEL
deleted file mode 100644
index db301f396..000000000
--- a/baseconfig/x86/x86_64/CONFIG_X86_5LEVEL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_5LEVEL is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_64_ACPI_NUMA b/baseconfig/x86/x86_64/CONFIG_X86_64_ACPI_NUMA
deleted file mode 100644
index 9ed4791dc..000000000
--- a/baseconfig/x86/x86_64/CONFIG_X86_64_ACPI_NUMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_64_ACPI_NUMA=y
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS b/baseconfig/x86/x86_64/CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
deleted file mode 100644
index 9d135af1d..000000000
--- a/baseconfig/x86/x86_64/CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_MPPARSE b/baseconfig/x86/x86_64/CONFIG_X86_MPPARSE
deleted file mode 100644
index 1e4f55144..000000000
--- a/baseconfig/x86/x86_64/CONFIG_X86_MPPARSE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_MPPARSE=y
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_NUMACHIP b/baseconfig/x86/x86_64/CONFIG_X86_NUMACHIP
deleted file mode 100644
index ad80ce426..000000000
--- a/baseconfig/x86/x86_64/CONFIG_X86_NUMACHIP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_NUMACHIP=y
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_UV b/baseconfig/x86/x86_64/CONFIG_X86_UV
deleted file mode 100644
index 48e2726e3..000000000
--- a/baseconfig/x86/x86_64/CONFIG_X86_UV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_UV=y
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_VSMP b/baseconfig/x86/x86_64/CONFIG_X86_VSMP
deleted file mode 100644
index 808ee39bf..000000000
--- a/baseconfig/x86/x86_64/CONFIG_X86_VSMP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_VSMP is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_X2APIC b/baseconfig/x86/x86_64/CONFIG_X86_X2APIC
deleted file mode 100644
index 8bee94dec..000000000
--- a/baseconfig/x86/x86_64/CONFIG_X86_X2APIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_X2APIC=y
diff --git a/baseconfig/x86/x86_64/CONFIG_X86_X32 b/baseconfig/x86/x86_64/CONFIG_X86_X32
deleted file mode 100644
index a2dfec15e..000000000
--- a/baseconfig/x86/x86_64/CONFIG_X86_X32
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_X86_X32 is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_XEN_512GB b/baseconfig/x86/x86_64/CONFIG_XEN_512GB
deleted file mode 100644
index 7ef73a72d..000000000
--- a/baseconfig/x86/x86_64/CONFIG_XEN_512GB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_512GB=y
diff --git a/baseconfig/x86/x86_64/CONFIG_XEN_BALLOON_MEMORY_HOTPLUG b/baseconfig/x86/x86_64/CONFIG_XEN_BALLOON_MEMORY_HOTPLUG
deleted file mode 100644
index 40df16cfe..000000000
--- a/baseconfig/x86/x86_64/CONFIG_XEN_BALLOON_MEMORY_HOTPLUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_XEN_DEV_EVTCHN b/baseconfig/x86/x86_64/CONFIG_XEN_DEV_EVTCHN
deleted file mode 100644
index a198d3b62..000000000
--- a/baseconfig/x86/x86_64/CONFIG_XEN_DEV_EVTCHN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_DEV_EVTCHN=m
diff --git a/baseconfig/x86/x86_64/CONFIG_XEN_MCE_LOG b/baseconfig/x86/x86_64/CONFIG_XEN_MCE_LOG
deleted file mode 100644
index e77983fae..000000000
--- a/baseconfig/x86/x86_64/CONFIG_XEN_MCE_LOG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_XEN_MCE_LOG is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_XEN_STUB b/baseconfig/x86/x86_64/CONFIG_XEN_STUB
deleted file mode 100644
index 4792a9049..000000000
--- a/baseconfig/x86/x86_64/CONFIG_XEN_STUB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_XEN_STUB is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_XEN_SYS_HYPERVISOR b/baseconfig/x86/x86_64/CONFIG_XEN_SYS_HYPERVISOR
deleted file mode 100644
index a8ff9c8e6..000000000
--- a/baseconfig/x86/x86_64/CONFIG_XEN_SYS_HYPERVISOR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XEN_SYS_HYPERVISOR=y
diff --git a/baseconfig/x86/x86_64/CONFIG_XO15_EBOOK b/baseconfig/x86/x86_64/CONFIG_XO15_EBOOK
deleted file mode 100644
index 625aa8cad..000000000
--- a/baseconfig/x86/x86_64/CONFIG_XO15_EBOOK
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_XO15_EBOOK is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_XPOWER_PMIC_OPREGION b/baseconfig/x86/x86_64/CONFIG_XPOWER_PMIC_OPREGION
deleted file mode 100644
index 8c98df142..000000000
--- a/baseconfig/x86/x86_64/CONFIG_XPOWER_PMIC_OPREGION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_XPOWER_PMIC_OPREGION=y
diff --git a/baseconfig/x86/x86_64/CONFIG_ZONE_DEVICE b/baseconfig/x86/x86_64/CONFIG_ZONE_DEVICE
deleted file mode 100644
index 7d0942fcf..000000000
--- a/baseconfig/x86/x86_64/CONFIG_ZONE_DEVICE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ZONE_DEVICE=y
diff --git a/baseconfig/x86/x86_64/CONFIG_ZONE_DMA b/baseconfig/x86/x86_64/CONFIG_ZONE_DMA
deleted file mode 100644
index c1b5f84a5..000000000
--- a/baseconfig/x86/x86_64/CONFIG_ZONE_DMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ZONE_DMA=y