summaryrefslogtreecommitdiffstats
path: root/baseconfig/s390x
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/s390x
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/s390x')
-rw-r--r--baseconfig/s390x/CONFIG_64BIT1
-rw-r--r--baseconfig/s390x/CONFIG_ACCESSIBILITY1
-rw-r--r--baseconfig/s390x/CONFIG_AFIUCV1
-rw-r--r--baseconfig/s390x/CONFIG_ALIM7101_WDT1
-rw-r--r--baseconfig/s390x/CONFIG_ALTERA_STAPL1
-rw-r--r--baseconfig/s390x/CONFIG_ALTERA_TSE1
-rw-r--r--baseconfig/s390x/CONFIG_APDS9802ALS1
-rw-r--r--baseconfig/s390x/CONFIG_APPLDATA_BASE1
-rw-r--r--baseconfig/s390x/CONFIG_APPLDATA_MEM1
-rw-r--r--baseconfig/s390x/CONFIG_APPLDATA_NET_SUM1
-rw-r--r--baseconfig/s390x/CONFIG_APPLDATA_OS1
-rw-r--r--baseconfig/s390x/CONFIG_ARCH_RANDOM1
-rw-r--r--baseconfig/s390x/CONFIG_ASYMMETRIC_KEY_TYPE1
-rw-r--r--baseconfig/s390x/CONFIG_ATA_OVER_ETH1
-rw-r--r--baseconfig/s390x/CONFIG_ATM_DRIVERS1
-rw-r--r--baseconfig/s390x/CONFIG_AUXDISPLAY1
-rw-r--r--baseconfig/s390x/CONFIG_B441
-rw-r--r--baseconfig/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE1
-rw-r--r--baseconfig/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT1
-rw-r--r--baseconfig/s390x/CONFIG_BCMA1
-rw-r--r--baseconfig/s390x/CONFIG_BE2ISCSI1
-rw-r--r--baseconfig/s390x/CONFIG_BLK_DEV_3W_XXXX_RAID1
-rw-r--r--baseconfig/s390x/CONFIG_BLK_DEV_DAC9601
-rw-r--r--baseconfig/s390x/CONFIG_BLK_DEV_SKD1
-rw-r--r--baseconfig/s390x/CONFIG_BLK_DEV_SX81
-rw-r--r--baseconfig/s390x/CONFIG_BLK_DEV_UMEM1
-rw-r--r--baseconfig/s390x/CONFIG_BLK_DEV_XPRAM1
-rw-r--r--baseconfig/s390x/CONFIG_BT1
-rw-r--r--baseconfig/s390x/CONFIG_CAN1
-rw-r--r--baseconfig/s390x/CONFIG_CB710_CORE1
-rw-r--r--baseconfig/s390x/CONFIG_CCW1
-rw-r--r--baseconfig/s390x/CONFIG_CCWGROUP1
-rw-r--r--baseconfig/s390x/CONFIG_CCW_CONSOLE1
-rw-r--r--baseconfig/s390x/CONFIG_CC_OPTIMIZE_FOR_SIZE1
-rw-r--r--baseconfig/s390x/CONFIG_CDROM_PKTCDVD1
-rw-r--r--baseconfig/s390x/CONFIG_CHARGER_SMB3471
-rw-r--r--baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE1
-rw-r--r--baseconfig/s390x/CONFIG_CHECK_STACK1
-rw-r--r--baseconfig/s390x/CONFIG_CHSC_SCH1
-rw-r--r--baseconfig/s390x/CONFIG_CMA1
-rw-r--r--baseconfig/s390x/CONFIG_CMA_AREAS1
-rw-r--r--baseconfig/s390x/CONFIG_CMA_DEBUG1
-rw-r--r--baseconfig/s390x/CONFIG_CMA_DEBUGFS1
-rw-r--r--baseconfig/s390x/CONFIG_CMM1
-rw-r--r--baseconfig/s390x/CONFIG_CMM_IUCV1
-rw-r--r--baseconfig/s390x/CONFIG_COMPAT1
-rw-r--r--baseconfig/s390x/CONFIG_CPU_IDLE1
-rw-r--r--baseconfig/s390x/CONFIG_CRC71
-rw-r--r--baseconfig/s390x/CONFIG_CRYPTO_AES_S3901
-rw-r--r--baseconfig/s390x/CONFIG_CRYPTO_CRC32_S3901
-rw-r--r--baseconfig/s390x/CONFIG_CRYPTO_DES_S3901
-rw-r--r--baseconfig/s390x/CONFIG_CRYPTO_GHASH_S3901
-rw-r--r--baseconfig/s390x/CONFIG_CRYPTO_PAES_S3901
-rw-r--r--baseconfig/s390x/CONFIG_CRYPTO_SHA1_S3901
-rw-r--r--baseconfig/s390x/CONFIG_CRYPTO_SHA256_S3901
-rw-r--r--baseconfig/s390x/CONFIG_CRYPTO_SHA512_S3901
-rw-r--r--baseconfig/s390x/CONFIG_CTC1
-rw-r--r--baseconfig/s390x/CONFIG_CTCM1
-rw-r--r--baseconfig/s390x/CONFIG_DASD1
-rw-r--r--baseconfig/s390x/CONFIG_DASD_DIAG1
-rw-r--r--baseconfig/s390x/CONFIG_DASD_ECKD1
-rw-r--r--baseconfig/s390x/CONFIG_DASD_EER1
-rw-r--r--baseconfig/s390x/CONFIG_DASD_FBA1
-rw-r--r--baseconfig/s390x/CONFIG_DASD_PROFILE1
-rw-r--r--baseconfig/s390x/CONFIG_DCSSBLK1
-rw-r--r--baseconfig/s390x/CONFIG_DIAG288_WATCHDOG1
-rw-r--r--baseconfig/s390x/CONFIG_DMADEVICES1
-rw-r--r--baseconfig/s390x/CONFIG_DNET1
-rw-r--r--baseconfig/s390x/CONFIG_DP83640_PHY1
-rw-r--r--baseconfig/s390x/CONFIG_DRM1
-rw-r--r--baseconfig/s390x/CONFIG_DW_DMAC1
-rw-r--r--baseconfig/s390x/CONFIG_EADM_SCH1
-rw-r--r--baseconfig/s390x/CONFIG_ECHO1
-rw-r--r--baseconfig/s390x/CONFIG_EMU_SIZE1
-rw-r--r--baseconfig/s390x/CONFIG_ENCLOSURE_SERVICES1
-rw-r--r--baseconfig/s390x/CONFIG_ETHOC1
-rw-r--r--baseconfig/s390x/CONFIG_FB1
-rw-r--r--baseconfig/s390x/CONFIG_FCOE1
-rw-r--r--baseconfig/s390x/CONFIG_FDDI1
-rw-r--r--baseconfig/s390x/CONFIG_FEALNX1
-rw-r--r--baseconfig/s390x/CONFIG_FIREWIRE1
-rw-r--r--baseconfig/s390x/CONFIG_FIREWIRE_NOSY1
-rw-r--r--baseconfig/s390x/CONFIG_FIXED_PHY1
-rw-r--r--baseconfig/s390x/CONFIG_FMC1
-rw-r--r--baseconfig/s390x/CONFIG_FUSION1
-rw-r--r--baseconfig/s390x/CONFIG_GAMEPORT1
-rw-r--r--baseconfig/s390x/CONFIG_GENERIC_PHY1
-rw-r--r--baseconfig/s390x/CONFIG_GENWQE1
-rw-r--r--baseconfig/s390x/CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY1
-rw-r--r--baseconfig/s390x/CONFIG_GPIOLIB1
-rw-r--r--baseconfig/s390x/CONFIG_HID1
-rw-r--r--baseconfig/s390x/CONFIG_HID_GENERIC1
-rw-r--r--baseconfig/s390x/CONFIG_HID_MAGICMOUSE1
-rw-r--r--baseconfig/s390x/CONFIG_HIPPI1
-rw-r--r--baseconfig/s390x/CONFIG_HOTPLUG_PCI_CPCI1
-rw-r--r--baseconfig/s390x/CONFIG_HOTPLUG_PCI_S3901
-rw-r--r--baseconfig/s390x/CONFIG_HOTPLUG_PCI_SHPC1
-rw-r--r--baseconfig/s390x/CONFIG_HVC_IUCV1
-rw-r--r--baseconfig/s390x/CONFIG_HWMON1
-rw-r--r--baseconfig/s390x/CONFIG_HW_RANDOM_S3901
-rw-r--r--baseconfig/s390x/CONFIG_HZ_1001
-rw-r--r--baseconfig/s390x/CONFIG_HZ_10001
-rw-r--r--baseconfig/s390x/CONFIG_I2C1
-rw-r--r--baseconfig/s390x/CONFIG_I2C_ALGOBIT1
-rw-r--r--baseconfig/s390x/CONFIG_I2C_ALGOPCA1
-rw-r--r--baseconfig/s390x/CONFIG_I2C_ALGOPCF1
-rw-r--r--baseconfig/s390x/CONFIG_I2C_CHARDEV1
-rw-r--r--baseconfig/s390x/CONFIG_I2C_COMPAT1
-rw-r--r--baseconfig/s390x/CONFIG_I2C_DESIGNWARE_PCI1
-rw-r--r--baseconfig/s390x/CONFIG_I2C_HELPER_AUTO1
-rw-r--r--baseconfig/s390x/CONFIG_I2C_HID1
-rw-r--r--baseconfig/s390x/CONFIG_I2C_NFORCE21
-rw-r--r--baseconfig/s390x/CONFIG_I2C_PCA_PLATFORM1
-rw-r--r--baseconfig/s390x/CONFIG_I2C_SIMTEC1
-rw-r--r--baseconfig/s390x/CONFIG_I2C_SLAVE1
-rw-r--r--baseconfig/s390x/CONFIG_I2C_SMBUS1
-rw-r--r--baseconfig/s390x/CONFIG_I2C_STUB1
-rw-r--r--baseconfig/s390x/CONFIG_I6300ESB_WDT1
-rw-r--r--baseconfig/s390x/CONFIG_IBM_PARTITION1
-rw-r--r--baseconfig/s390x/CONFIG_IEEE802154_DRIVERS1
-rw-r--r--baseconfig/s390x/CONFIG_IIO1
-rw-r--r--baseconfig/s390x/CONFIG_INFINIBAND_CXGB31
-rw-r--r--baseconfig/s390x/CONFIG_INFINIBAND_CXGB41
-rw-r--r--baseconfig/s390x/CONFIG_INFINIBAND_MTHCA1
-rw-r--r--baseconfig/s390x/CONFIG_INFINIBAND_NES1
-rw-r--r--baseconfig/s390x/CONFIG_INFINIBAND_OCRDMA1
-rw-r--r--baseconfig/s390x/CONFIG_INFINIBAND_QIB1
-rw-r--r--baseconfig/s390x/CONFIG_INPUT_FF_MEMLESS1
-rw-r--r--baseconfig/s390x/CONFIG_INPUT_JOYDEV1
-rw-r--r--baseconfig/s390x/CONFIG_INPUT_JOYSTICK1
-rw-r--r--baseconfig/s390x/CONFIG_INPUT_KEYBOARD1
-rw-r--r--baseconfig/s390x/CONFIG_INPUT_MISC1
-rw-r--r--baseconfig/s390x/CONFIG_INPUT_MOUSE1
-rw-r--r--baseconfig/s390x/CONFIG_INPUT_MOUSEDEV1
-rw-r--r--baseconfig/s390x/CONFIG_INPUT_POLLDEV1
-rw-r--r--baseconfig/s390x/CONFIG_INPUT_SPARSEKMAP1
-rw-r--r--baseconfig/s390x/CONFIG_INPUT_TABLET1
-rw-r--r--baseconfig/s390x/CONFIG_INPUT_TOUCHSCREEN1
-rw-r--r--baseconfig/s390x/CONFIG_IP10001
-rw-r--r--baseconfig/s390x/CONFIG_IPL1
-rw-r--r--baseconfig/s390x/CONFIG_IRDA1
-rw-r--r--baseconfig/s390x/CONFIG_IRQ_DOMAIN_DEBUG1
-rw-r--r--baseconfig/s390x/CONFIG_ISL290031
-rw-r--r--baseconfig/s390x/CONFIG_ISL290201
-rw-r--r--baseconfig/s390x/CONFIG_IUCV1
-rw-r--r--baseconfig/s390x/CONFIG_JME1
-rw-r--r--baseconfig/s390x/CONFIG_KVM1
-rw-r--r--baseconfig/s390x/CONFIG_KVM_S390_UCONTROL1
-rw-r--r--baseconfig/s390x/CONFIG_LCD_CLASS_DEVICE1
-rw-r--r--baseconfig/s390x/CONFIG_LCD_PLATFORM1
-rw-r--r--baseconfig/s390x/CONFIG_LCS1
-rw-r--r--baseconfig/s390x/CONFIG_LOG_BUF_SHIFT1
-rw-r--r--baseconfig/s390x/CONFIG_MAC802111
-rw-r--r--baseconfig/s390x/CONFIG_MAC_PARTITION1
-rw-r--r--baseconfig/s390x/CONFIG_MARCH_ZEC121
-rw-r--r--baseconfig/s390x/CONFIG_MAX_PHYSMEM_BITS1
-rw-r--r--baseconfig/s390x/CONFIG_MDIO_DEVICE1
-rw-r--r--baseconfig/s390x/CONFIG_MEDIA_SUPPORT1
-rw-r--r--baseconfig/s390x/CONFIG_MEGARAID_LEGACY1
-rw-r--r--baseconfig/s390x/CONFIG_MEGARAID_NEWGEN1
-rw-r--r--baseconfig/s390x/CONFIG_MEGARAID_SAS1
-rw-r--r--baseconfig/s390x/CONFIG_MEMORY_HOTPLUG1
-rw-r--r--baseconfig/s390x/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE1
-rw-r--r--baseconfig/s390x/CONFIG_MEMORY_HOTREMOVE1
-rw-r--r--baseconfig/s390x/CONFIG_MEMSTICK1
-rw-r--r--baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY1
-rw-r--r--baseconfig/s390x/CONFIG_MFD_BD9571MWV1
-rw-r--r--baseconfig/s390x/CONFIG_MFD_CORE1
-rw-r--r--baseconfig/s390x/CONFIG_MFD_RTSX_PCI1
-rw-r--r--baseconfig/s390x/CONFIG_MFD_RTSX_USB1
-rw-r--r--baseconfig/s390x/CONFIG_MFD_SM5011
-rw-r--r--baseconfig/s390x/CONFIG_MFD_TPS684701
-rw-r--r--baseconfig/s390x/CONFIG_MFD_VIPERBOARD1
-rw-r--r--baseconfig/s390x/CONFIG_MFD_VX8551
-rw-r--r--baseconfig/s390x/CONFIG_MFD_WL1273_CORE1
-rw-r--r--baseconfig/s390x/CONFIG_MISDN_HFCMULTI1
-rw-r--r--baseconfig/s390x/CONFIG_MLXSW_CORE1
-rw-r--r--baseconfig/s390x/CONFIG_MMC1
-rw-r--r--baseconfig/s390x/CONFIG_MONREADER1
-rw-r--r--baseconfig/s390x/CONFIG_MONWRITER1
-rw-r--r--baseconfig/s390x/CONFIG_MSDOS_PARTITION1
-rw-r--r--baseconfig/s390x/CONFIG_MTD1
-rw-r--r--baseconfig/s390x/CONFIG_NETCONSOLE1
-rw-r--r--baseconfig/s390x/CONFIG_NETIUCV1
-rw-r--r--baseconfig/s390x/CONFIG_NET_CADENCE1
-rw-r--r--baseconfig/s390x/CONFIG_NET_PACKET_ENGINE1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_3COM1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_83901
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_ADAPTEC1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_AGERE1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_ALTEON1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_AMAZON1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_AMD1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_ARC1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_ATHEROS1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_BROADCOM1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_BROCADE1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_CHELSIO1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_CISCO1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_DEC1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_DLINK1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_EMULEX1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_EXAR1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_HP1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_INTEL1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_MARVELL1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_MICREL1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_MYRI1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_NATSEMI1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_NETRONOME1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_NVIDIA1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_OKI1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_QLOGIC1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_RDC1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_REALTEK1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_ROCKER1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_SEEQ1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_SILAN1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_SIS1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_SMSC1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_STMICRO1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_SUN1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_TEHUTI1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_TI1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_VIA1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_WIZNET1
-rw-r--r--baseconfig/s390x/CONFIG_NET_VENDOR_XIRCOM1
-rw-r--r--baseconfig/s390x/CONFIG_NEW_LEDS1
-rw-r--r--baseconfig/s390x/CONFIG_NFC1
-rw-r--r--baseconfig/s390x/CONFIG_NODES_SHIFT1
-rw-r--r--baseconfig/s390x/CONFIG_NOZOMI1
-rw-r--r--baseconfig/s390x/CONFIG_NR_CPUS1
-rw-r--r--baseconfig/s390x/CONFIG_NUMA1
-rw-r--r--baseconfig/s390x/CONFIG_NUMA_BALANCING1
-rw-r--r--baseconfig/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED1
-rw-r--r--baseconfig/s390x/CONFIG_NUMA_EMU1
-rw-r--r--baseconfig/s390x/CONFIG_N_GSM1
-rw-r--r--baseconfig/s390x/CONFIG_OF1
-rw-r--r--baseconfig/s390x/CONFIG_OSF_PARTITION1
-rw-r--r--baseconfig/s390x/CONFIG_PACK_STACK1
-rw-r--r--baseconfig/s390x/CONFIG_PARTITION_ADVANCED1
-rw-r--r--baseconfig/s390x/CONFIG_PCI1
-rw-r--r--baseconfig/s390x/CONFIG_PCIPCWATCHDOG1
-rw-r--r--baseconfig/s390x/CONFIG_PCI_MSI_IRQ_DOMAIN1
-rw-r--r--baseconfig/s390x/CONFIG_PCI_NR_FUNCTIONS1
-rw-r--r--baseconfig/s390x/CONFIG_PCMCIA1
-rw-r--r--baseconfig/s390x/CONFIG_PFAULT1
-rw-r--r--baseconfig/s390x/CONFIG_PHYLIB1
-rw-r--r--baseconfig/s390x/CONFIG_PKEY1
-rw-r--r--baseconfig/s390x/CONFIG_PM_DEVFREQ1
-rw-r--r--baseconfig/s390x/CONFIG_POWER_RESET1
-rw-r--r--baseconfig/s390x/CONFIG_PREEMPT_TRACER1
-rw-r--r--baseconfig/s390x/CONFIG_PWM1
-rw-r--r--baseconfig/s390x/CONFIG_QDIO1
-rw-r--r--baseconfig/s390x/CONFIG_QETH1
-rw-r--r--baseconfig/s390x/CONFIG_QETH_IPV61
-rw-r--r--baseconfig/s390x/CONFIG_QETH_L21
-rw-r--r--baseconfig/s390x/CONFIG_QETH_L31
-rw-r--r--baseconfig/s390x/CONFIG_R39641
-rw-r--r--baseconfig/s390x/CONFIG_RCU_FANOUT1
-rw-r--r--baseconfig/s390x/CONFIG_RCU_FANOUT_LEAF1
-rw-r--r--baseconfig/s390x/CONFIG_RESET_CONTROLLER1
-rw-r--r--baseconfig/s390x/CONFIG_RFKILL1
-rw-r--r--baseconfig/s390x/CONFIG_RMI4_CORE1
-rw-r--r--baseconfig/s390x/CONFIG_S390_CCW_IOMMU1
-rw-r--r--baseconfig/s390x/CONFIG_S390_GUEST1
-rw-r--r--baseconfig/s390x/CONFIG_S390_GUEST_OLD_TRANSPORT1
-rw-r--r--baseconfig/s390x/CONFIG_S390_HYPFS_FS1
-rw-r--r--baseconfig/s390x/CONFIG_S390_PRNG1
-rw-r--r--baseconfig/s390x/CONFIG_S390_PTDUMP1
-rw-r--r--baseconfig/s390x/CONFIG_S390_TAPE1
-rw-r--r--baseconfig/s390x/CONFIG_S390_TAPE_34XX1
-rw-r--r--baseconfig/s390x/CONFIG_S390_TAPE_35901
-rw-r--r--baseconfig/s390x/CONFIG_S390_VMUR1
-rw-r--r--baseconfig/s390x/CONFIG_SCHED_BOOK1
-rw-r--r--baseconfig/s390x/CONFIG_SCHED_MC1
-rw-r--r--baseconfig/s390x/CONFIG_SCHED_TOPOLOGY1
-rw-r--r--baseconfig/s390x/CONFIG_SCLP_ASYNC1
-rw-r--r--baseconfig/s390x/CONFIG_SCLP_ASYNC_ID1
-rw-r--r--baseconfig/s390x/CONFIG_SCLP_CONSOLE1
-rw-r--r--baseconfig/s390x/CONFIG_SCLP_OFB1
-rw-r--r--baseconfig/s390x/CONFIG_SCLP_TTY1
-rw-r--r--baseconfig/s390x/CONFIG_SCLP_VT220_CONSOLE1
-rw-r--r--baseconfig/s390x/CONFIG_SCLP_VT220_TTY1
-rw-r--r--baseconfig/s390x/CONFIG_SCM_BLOCK1
-rw-r--r--baseconfig/s390x/CONFIG_SCM_BLOCK_CLUSTER_WRITE1
-rw-r--r--baseconfig/s390x/CONFIG_SCM_BUS1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_3W_9XXX1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_3W_SAS1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_AACRAID1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_ACARD1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_AIC79XX1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_AIC7XXX1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_AM53C9741
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_ARCMSR1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_BFA_FC1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_BNX2X_FCOE1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_BNX2_ISCSI1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_CHELSIO_FCOE1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_CXGB3_ISCSI1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_CXGB4_ISCSI1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_DC395x1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_DH1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_DMX3191D1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_ESAS2R1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_HPSA1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_HPTIOP1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_INIA1001
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_INITIO1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_IPS1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_LPFC1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_MPT2SAS1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_MPT3SAS1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_MVSAS1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_MVUMI1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_PM80011
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_PMCRAID1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_QLA_FC1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_QLA_ISCSI1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_QLOGIC_12801
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_SNIC1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_STEX1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_SYM53C8XX_21
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_UFSHCD1
-rw-r--r--baseconfig/s390x/CONFIG_SCSI_WD719X1
-rw-r--r--baseconfig/s390x/CONFIG_SENSORS_APDS990X1
-rw-r--r--baseconfig/s390x/CONFIG_SENSORS_BH17701
-rw-r--r--baseconfig/s390x/CONFIG_SENSORS_LIS3LV02D1
-rw-r--r--baseconfig/s390x/CONFIG_SENSORS_LIS3_I2C1
-rw-r--r--baseconfig/s390x/CONFIG_SENSORS_TSL25501
-rw-r--r--baseconfig/s390x/CONFIG_SERIAL_82501
-rw-r--r--baseconfig/s390x/CONFIG_SERIAL_CORE1
-rw-r--r--baseconfig/s390x/CONFIG_SERIAL_NONSTANDARD1
-rw-r--r--baseconfig/s390x/CONFIG_SERIO1
-rw-r--r--baseconfig/s390x/CONFIG_SERIO_LIBPS21
-rw-r--r--baseconfig/s390x/CONFIG_SERIO_SERPORT1
-rw-r--r--baseconfig/s390x/CONFIG_SFC1
-rw-r--r--baseconfig/s390x/CONFIG_SGI_PARTITION1
-rw-r--r--baseconfig/s390x/CONFIG_SHARED_KERNEL1
-rw-r--r--baseconfig/s390x/CONFIG_SH_ETH1
-rw-r--r--baseconfig/s390x/CONFIG_SLIP1
-rw-r--r--baseconfig/s390x/CONFIG_SMSGIUCV1
-rw-r--r--baseconfig/s390x/CONFIG_SMSGIUCV_EVENT1
-rw-r--r--baseconfig/s390x/CONFIG_SOUND1
-rw-r--r--baseconfig/s390x/CONFIG_SSB1
-rw-r--r--baseconfig/s390x/CONFIG_STACK_GUARD1
-rw-r--r--baseconfig/s390x/CONFIG_STAGING1
-rw-r--r--baseconfig/s390x/CONFIG_SUN_PARTITION1
-rw-r--r--baseconfig/s390x/CONFIG_SUSPEND1
-rw-r--r--baseconfig/s390x/CONFIG_THERMAL1
-rw-r--r--baseconfig/s390x/CONFIG_TIFM_CORE1
-rw-r--r--baseconfig/s390x/CONFIG_TN32151
-rw-r--r--baseconfig/s390x/CONFIG_TN3215_CONSOLE1
-rw-r--r--baseconfig/s390x/CONFIG_TN32701
-rw-r--r--baseconfig/s390x/CONFIG_TN3270_CONSOLE1
-rw-r--r--baseconfig/s390x/CONFIG_TN3270_FS1
-rw-r--r--baseconfig/s390x/CONFIG_TN3270_TTY1
-rw-r--r--baseconfig/s390x/CONFIG_TR1
-rw-r--r--baseconfig/s390x/CONFIG_TRANSPARENT_HUGEPAGE1
-rw-r--r--baseconfig/s390x/CONFIG_UIO1
-rw-r--r--baseconfig/s390x/CONFIG_USB_SUPPORT1
-rw-r--r--baseconfig/s390x/CONFIG_UWB1
-rw-r--r--baseconfig/s390x/CONFIG_VFIO_CCW1
-rw-r--r--baseconfig/s390x/CONFIG_VIRTIO_CONSOLE1
-rw-r--r--baseconfig/s390x/CONFIG_VMCP1
-rw-r--r--baseconfig/s390x/CONFIG_VMCP_CMA_SIZE1
-rw-r--r--baseconfig/s390x/CONFIG_VMLOGRDR1
-rw-r--r--baseconfig/s390x/CONFIG_W11
-rw-r--r--baseconfig/s390x/CONFIG_WAN1
-rw-r--r--baseconfig/s390x/CONFIG_WARN_DYNAMIC_STACK1
-rw-r--r--baseconfig/s390x/CONFIG_WDTPCI1
-rw-r--r--baseconfig/s390x/CONFIG_WIRELESS_EXT1
-rw-r--r--baseconfig/s390x/CONFIG_XILLYBUS1
-rw-r--r--baseconfig/s390x/CONFIG_ZCRYPT1
-rw-r--r--baseconfig/s390x/CONFIG_ZFCP1
375 files changed, 0 insertions, 375 deletions
diff --git a/baseconfig/s390x/CONFIG_64BIT b/baseconfig/s390x/CONFIG_64BIT
deleted file mode 100644
index 06a94e48b..000000000
--- a/baseconfig/s390x/CONFIG_64BIT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_64BIT=y
diff --git a/baseconfig/s390x/CONFIG_ACCESSIBILITY b/baseconfig/s390x/CONFIG_ACCESSIBILITY
deleted file mode 100644
index 9047179a2..000000000
--- a/baseconfig/s390x/CONFIG_ACCESSIBILITY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ACCESSIBILITY is not set
diff --git a/baseconfig/s390x/CONFIG_AFIUCV b/baseconfig/s390x/CONFIG_AFIUCV
deleted file mode 100644
index cf9b10c4c..000000000
--- a/baseconfig/s390x/CONFIG_AFIUCV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AFIUCV=m
diff --git a/baseconfig/s390x/CONFIG_ALIM7101_WDT b/baseconfig/s390x/CONFIG_ALIM7101_WDT
deleted file mode 100644
index b5ad49883..000000000
--- a/baseconfig/s390x/CONFIG_ALIM7101_WDT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ALIM7101_WDT is not set
diff --git a/baseconfig/s390x/CONFIG_ALTERA_STAPL b/baseconfig/s390x/CONFIG_ALTERA_STAPL
deleted file mode 100644
index f454734fa..000000000
--- a/baseconfig/s390x/CONFIG_ALTERA_STAPL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ALTERA_STAPL is not set
diff --git a/baseconfig/s390x/CONFIG_ALTERA_TSE b/baseconfig/s390x/CONFIG_ALTERA_TSE
deleted file mode 100644
index f803036e8..000000000
--- a/baseconfig/s390x/CONFIG_ALTERA_TSE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ALTERA_TSE is not set
diff --git a/baseconfig/s390x/CONFIG_APDS9802ALS b/baseconfig/s390x/CONFIG_APDS9802ALS
deleted file mode 100644
index c40795bfa..000000000
--- a/baseconfig/s390x/CONFIG_APDS9802ALS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_APDS9802ALS is not set
diff --git a/baseconfig/s390x/CONFIG_APPLDATA_BASE b/baseconfig/s390x/CONFIG_APPLDATA_BASE
deleted file mode 100644
index 047d81b72..000000000
--- a/baseconfig/s390x/CONFIG_APPLDATA_BASE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_APPLDATA_BASE=y
diff --git a/baseconfig/s390x/CONFIG_APPLDATA_MEM b/baseconfig/s390x/CONFIG_APPLDATA_MEM
deleted file mode 100644
index f76cca7ee..000000000
--- a/baseconfig/s390x/CONFIG_APPLDATA_MEM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_APPLDATA_MEM=m
diff --git a/baseconfig/s390x/CONFIG_APPLDATA_NET_SUM b/baseconfig/s390x/CONFIG_APPLDATA_NET_SUM
deleted file mode 100644
index 227cf0fd7..000000000
--- a/baseconfig/s390x/CONFIG_APPLDATA_NET_SUM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_APPLDATA_NET_SUM=m
diff --git a/baseconfig/s390x/CONFIG_APPLDATA_OS b/baseconfig/s390x/CONFIG_APPLDATA_OS
deleted file mode 100644
index 367849374..000000000
--- a/baseconfig/s390x/CONFIG_APPLDATA_OS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_APPLDATA_OS=m
diff --git a/baseconfig/s390x/CONFIG_ARCH_RANDOM b/baseconfig/s390x/CONFIG_ARCH_RANDOM
deleted file mode 100644
index 51658fe1c..000000000
--- a/baseconfig/s390x/CONFIG_ARCH_RANDOM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_RANDOM=y
diff --git a/baseconfig/s390x/CONFIG_ASYMMETRIC_KEY_TYPE b/baseconfig/s390x/CONFIG_ASYMMETRIC_KEY_TYPE
deleted file mode 100644
index c7d15a4b1..000000000
--- a/baseconfig/s390x/CONFIG_ASYMMETRIC_KEY_TYPE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ASYMMETRIC_KEY_TYPE=y
diff --git a/baseconfig/s390x/CONFIG_ATA_OVER_ETH b/baseconfig/s390x/CONFIG_ATA_OVER_ETH
deleted file mode 100644
index 4742a6278..000000000
--- a/baseconfig/s390x/CONFIG_ATA_OVER_ETH
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ATA_OVER_ETH is not set
diff --git a/baseconfig/s390x/CONFIG_ATM_DRIVERS b/baseconfig/s390x/CONFIG_ATM_DRIVERS
deleted file mode 100644
index 9ef2a621b..000000000
--- a/baseconfig/s390x/CONFIG_ATM_DRIVERS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ATM_DRIVERS is not set
diff --git a/baseconfig/s390x/CONFIG_AUXDISPLAY b/baseconfig/s390x/CONFIG_AUXDISPLAY
deleted file mode 100644
index 36da27ae2..000000000
--- a/baseconfig/s390x/CONFIG_AUXDISPLAY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_AUXDISPLAY is not set
diff --git a/baseconfig/s390x/CONFIG_B44 b/baseconfig/s390x/CONFIG_B44
deleted file mode 100644
index f1e41b307..000000000
--- a/baseconfig/s390x/CONFIG_B44
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_B44 is not set
diff --git a/baseconfig/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE b/baseconfig/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE
deleted file mode 100644
index 9cd604bc5..000000000
--- a/baseconfig/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
diff --git a/baseconfig/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT b/baseconfig/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT
deleted file mode 100644
index 3ee77acd7..000000000
--- a/baseconfig/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
diff --git a/baseconfig/s390x/CONFIG_BCMA b/baseconfig/s390x/CONFIG_BCMA
deleted file mode 100644
index 826862de6..000000000
--- a/baseconfig/s390x/CONFIG_BCMA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BCMA is not set
diff --git a/baseconfig/s390x/CONFIG_BE2ISCSI b/baseconfig/s390x/CONFIG_BE2ISCSI
deleted file mode 100644
index 49fffd76e..000000000
--- a/baseconfig/s390x/CONFIG_BE2ISCSI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BE2ISCSI is not set
diff --git a/baseconfig/s390x/CONFIG_BLK_DEV_3W_XXXX_RAID b/baseconfig/s390x/CONFIG_BLK_DEV_3W_XXXX_RAID
deleted file mode 100644
index 0fbe95ebc..000000000
--- a/baseconfig/s390x/CONFIG_BLK_DEV_3W_XXXX_RAID
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
diff --git a/baseconfig/s390x/CONFIG_BLK_DEV_DAC960 b/baseconfig/s390x/CONFIG_BLK_DEV_DAC960
deleted file mode 100644
index 4cc1142cb..000000000
--- a/baseconfig/s390x/CONFIG_BLK_DEV_DAC960
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_DEV_DAC960 is not set
diff --git a/baseconfig/s390x/CONFIG_BLK_DEV_SKD b/baseconfig/s390x/CONFIG_BLK_DEV_SKD
deleted file mode 100644
index cc05158fb..000000000
--- a/baseconfig/s390x/CONFIG_BLK_DEV_SKD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_DEV_SKD is not set
diff --git a/baseconfig/s390x/CONFIG_BLK_DEV_SX8 b/baseconfig/s390x/CONFIG_BLK_DEV_SX8
deleted file mode 100644
index 76e0342ed..000000000
--- a/baseconfig/s390x/CONFIG_BLK_DEV_SX8
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_DEV_SX8 is not set
diff --git a/baseconfig/s390x/CONFIG_BLK_DEV_UMEM b/baseconfig/s390x/CONFIG_BLK_DEV_UMEM
deleted file mode 100644
index 6265b8162..000000000
--- a/baseconfig/s390x/CONFIG_BLK_DEV_UMEM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_DEV_UMEM is not set
diff --git a/baseconfig/s390x/CONFIG_BLK_DEV_XPRAM b/baseconfig/s390x/CONFIG_BLK_DEV_XPRAM
deleted file mode 100644
index efd128be7..000000000
--- a/baseconfig/s390x/CONFIG_BLK_DEV_XPRAM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BLK_DEV_XPRAM=m
diff --git a/baseconfig/s390x/CONFIG_BT b/baseconfig/s390x/CONFIG_BT
deleted file mode 100644
index ce6ddb435..000000000
--- a/baseconfig/s390x/CONFIG_BT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BT is not set
diff --git a/baseconfig/s390x/CONFIG_CAN b/baseconfig/s390x/CONFIG_CAN
deleted file mode 100644
index 37ca11c95..000000000
--- a/baseconfig/s390x/CONFIG_CAN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CAN is not set
diff --git a/baseconfig/s390x/CONFIG_CB710_CORE b/baseconfig/s390x/CONFIG_CB710_CORE
deleted file mode 100644
index 9ef43951f..000000000
--- a/baseconfig/s390x/CONFIG_CB710_CORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CB710_CORE is not set
diff --git a/baseconfig/s390x/CONFIG_CCW b/baseconfig/s390x/CONFIG_CCW
deleted file mode 100644
index 400afc59d..000000000
--- a/baseconfig/s390x/CONFIG_CCW
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CCW=y
diff --git a/baseconfig/s390x/CONFIG_CCWGROUP b/baseconfig/s390x/CONFIG_CCWGROUP
deleted file mode 100644
index d991b6148..000000000
--- a/baseconfig/s390x/CONFIG_CCWGROUP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CCWGROUP=m
diff --git a/baseconfig/s390x/CONFIG_CCW_CONSOLE b/baseconfig/s390x/CONFIG_CCW_CONSOLE
deleted file mode 100644
index 42dc8edb7..000000000
--- a/baseconfig/s390x/CONFIG_CCW_CONSOLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CCW_CONSOLE=y
diff --git a/baseconfig/s390x/CONFIG_CC_OPTIMIZE_FOR_SIZE b/baseconfig/s390x/CONFIG_CC_OPTIMIZE_FOR_SIZE
deleted file mode 100644
index 781657e57..000000000
--- a/baseconfig/s390x/CONFIG_CC_OPTIMIZE_FOR_SIZE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
diff --git a/baseconfig/s390x/CONFIG_CDROM_PKTCDVD b/baseconfig/s390x/CONFIG_CDROM_PKTCDVD
deleted file mode 100644
index db486cc44..000000000
--- a/baseconfig/s390x/CONFIG_CDROM_PKTCDVD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CDROM_PKTCDVD is not set
diff --git a/baseconfig/s390x/CONFIG_CHARGER_SMB347 b/baseconfig/s390x/CONFIG_CHARGER_SMB347
deleted file mode 100644
index d7b8424a8..000000000
--- a/baseconfig/s390x/CONFIG_CHARGER_SMB347
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CHARGER_SMB347 is not set
diff --git a/baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE b/baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE
deleted file mode 100644
index c554a09ce..000000000
--- a/baseconfig/s390x/CONFIG_CHECKPOINT_RESTORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CHECKPOINT_RESTORE=y
diff --git a/baseconfig/s390x/CONFIG_CHECK_STACK b/baseconfig/s390x/CONFIG_CHECK_STACK
deleted file mode 100644
index abad841c1..000000000
--- a/baseconfig/s390x/CONFIG_CHECK_STACK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CHECK_STACK=y
diff --git a/baseconfig/s390x/CONFIG_CHSC_SCH b/baseconfig/s390x/CONFIG_CHSC_SCH
deleted file mode 100644
index dae83ee85..000000000
--- a/baseconfig/s390x/CONFIG_CHSC_SCH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CHSC_SCH=m
diff --git a/baseconfig/s390x/CONFIG_CMA b/baseconfig/s390x/CONFIG_CMA
deleted file mode 100644
index 309c9e771..000000000
--- a/baseconfig/s390x/CONFIG_CMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CMA=y
diff --git a/baseconfig/s390x/CONFIG_CMA_AREAS b/baseconfig/s390x/CONFIG_CMA_AREAS
deleted file mode 100644
index 5474a48e9..000000000
--- a/baseconfig/s390x/CONFIG_CMA_AREAS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CMA_AREAS=7
diff --git a/baseconfig/s390x/CONFIG_CMA_DEBUG b/baseconfig/s390x/CONFIG_CMA_DEBUG
deleted file mode 100644
index 64ff80c56..000000000
--- a/baseconfig/s390x/CONFIG_CMA_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CMA_DEBUG is not set
diff --git a/baseconfig/s390x/CONFIG_CMA_DEBUGFS b/baseconfig/s390x/CONFIG_CMA_DEBUGFS
deleted file mode 100644
index fba89903a..000000000
--- a/baseconfig/s390x/CONFIG_CMA_DEBUGFS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CMA_DEBUGFS is not set
diff --git a/baseconfig/s390x/CONFIG_CMM b/baseconfig/s390x/CONFIG_CMM
deleted file mode 100644
index 7d44d9928..000000000
--- a/baseconfig/s390x/CONFIG_CMM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CMM=m
diff --git a/baseconfig/s390x/CONFIG_CMM_IUCV b/baseconfig/s390x/CONFIG_CMM_IUCV
deleted file mode 100644
index 8c8a337aa..000000000
--- a/baseconfig/s390x/CONFIG_CMM_IUCV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CMM_IUCV=y
diff --git a/baseconfig/s390x/CONFIG_COMPAT b/baseconfig/s390x/CONFIG_COMPAT
deleted file mode 100644
index 9b072bae7..000000000
--- a/baseconfig/s390x/CONFIG_COMPAT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_COMPAT=y
diff --git a/baseconfig/s390x/CONFIG_CPU_IDLE b/baseconfig/s390x/CONFIG_CPU_IDLE
deleted file mode 100644
index 624103e09..000000000
--- a/baseconfig/s390x/CONFIG_CPU_IDLE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CPU_IDLE is not set
diff --git a/baseconfig/s390x/CONFIG_CRC7 b/baseconfig/s390x/CONFIG_CRC7
deleted file mode 100644
index 51fff909f..000000000
--- a/baseconfig/s390x/CONFIG_CRC7
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CRC7 is not set
diff --git a/baseconfig/s390x/CONFIG_CRYPTO_AES_S390 b/baseconfig/s390x/CONFIG_CRYPTO_AES_S390
deleted file mode 100644
index d86bd34c9..000000000
--- a/baseconfig/s390x/CONFIG_CRYPTO_AES_S390
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_AES_S390=m
diff --git a/baseconfig/s390x/CONFIG_CRYPTO_CRC32_S390 b/baseconfig/s390x/CONFIG_CRYPTO_CRC32_S390
deleted file mode 100644
index d8d9c528f..000000000
--- a/baseconfig/s390x/CONFIG_CRYPTO_CRC32_S390
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_CRC32_S390=m
diff --git a/baseconfig/s390x/CONFIG_CRYPTO_DES_S390 b/baseconfig/s390x/CONFIG_CRYPTO_DES_S390
deleted file mode 100644
index 55160e0e0..000000000
--- a/baseconfig/s390x/CONFIG_CRYPTO_DES_S390
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_DES_S390=m
diff --git a/baseconfig/s390x/CONFIG_CRYPTO_GHASH_S390 b/baseconfig/s390x/CONFIG_CRYPTO_GHASH_S390
deleted file mode 100644
index 4f1c7a6a5..000000000
--- a/baseconfig/s390x/CONFIG_CRYPTO_GHASH_S390
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_GHASH_S390=m
diff --git a/baseconfig/s390x/CONFIG_CRYPTO_PAES_S390 b/baseconfig/s390x/CONFIG_CRYPTO_PAES_S390
deleted file mode 100644
index f7071dfd3..000000000
--- a/baseconfig/s390x/CONFIG_CRYPTO_PAES_S390
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_PAES_S390=m
diff --git a/baseconfig/s390x/CONFIG_CRYPTO_SHA1_S390 b/baseconfig/s390x/CONFIG_CRYPTO_SHA1_S390
deleted file mode 100644
index d2c456c8d..000000000
--- a/baseconfig/s390x/CONFIG_CRYPTO_SHA1_S390
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_SHA1_S390=m
diff --git a/baseconfig/s390x/CONFIG_CRYPTO_SHA256_S390 b/baseconfig/s390x/CONFIG_CRYPTO_SHA256_S390
deleted file mode 100644
index 5fb3e354f..000000000
--- a/baseconfig/s390x/CONFIG_CRYPTO_SHA256_S390
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_SHA256_S390=m
diff --git a/baseconfig/s390x/CONFIG_CRYPTO_SHA512_S390 b/baseconfig/s390x/CONFIG_CRYPTO_SHA512_S390
deleted file mode 100644
index 484db3b6d..000000000
--- a/baseconfig/s390x/CONFIG_CRYPTO_SHA512_S390
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_SHA512_S390=m
diff --git a/baseconfig/s390x/CONFIG_CTC b/baseconfig/s390x/CONFIG_CTC
deleted file mode 100644
index c2fb96b74..000000000
--- a/baseconfig/s390x/CONFIG_CTC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CTC=m
diff --git a/baseconfig/s390x/CONFIG_CTCM b/baseconfig/s390x/CONFIG_CTCM
deleted file mode 100644
index b1b25e672..000000000
--- a/baseconfig/s390x/CONFIG_CTCM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CTCM=m
diff --git a/baseconfig/s390x/CONFIG_DASD b/baseconfig/s390x/CONFIG_DASD
deleted file mode 100644
index 3dccde2b2..000000000
--- a/baseconfig/s390x/CONFIG_DASD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DASD=m
diff --git a/baseconfig/s390x/CONFIG_DASD_DIAG b/baseconfig/s390x/CONFIG_DASD_DIAG
deleted file mode 100644
index 1c7d85b1a..000000000
--- a/baseconfig/s390x/CONFIG_DASD_DIAG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DASD_DIAG=m
diff --git a/baseconfig/s390x/CONFIG_DASD_ECKD b/baseconfig/s390x/CONFIG_DASD_ECKD
deleted file mode 100644
index 9e75bd150..000000000
--- a/baseconfig/s390x/CONFIG_DASD_ECKD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DASD_ECKD=m
diff --git a/baseconfig/s390x/CONFIG_DASD_EER b/baseconfig/s390x/CONFIG_DASD_EER
deleted file mode 100644
index 084fbc195..000000000
--- a/baseconfig/s390x/CONFIG_DASD_EER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DASD_EER=y
diff --git a/baseconfig/s390x/CONFIG_DASD_FBA b/baseconfig/s390x/CONFIG_DASD_FBA
deleted file mode 100644
index a237f2b12..000000000
--- a/baseconfig/s390x/CONFIG_DASD_FBA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DASD_FBA=m
diff --git a/baseconfig/s390x/CONFIG_DASD_PROFILE b/baseconfig/s390x/CONFIG_DASD_PROFILE
deleted file mode 100644
index 0f763f1b1..000000000
--- a/baseconfig/s390x/CONFIG_DASD_PROFILE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DASD_PROFILE=y
diff --git a/baseconfig/s390x/CONFIG_DCSSBLK b/baseconfig/s390x/CONFIG_DCSSBLK
deleted file mode 100644
index ddad256fb..000000000
--- a/baseconfig/s390x/CONFIG_DCSSBLK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DCSSBLK=m
diff --git a/baseconfig/s390x/CONFIG_DIAG288_WATCHDOG b/baseconfig/s390x/CONFIG_DIAG288_WATCHDOG
deleted file mode 100644
index b5287c558..000000000
--- a/baseconfig/s390x/CONFIG_DIAG288_WATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DIAG288_WATCHDOG=m
diff --git a/baseconfig/s390x/CONFIG_DMADEVICES b/baseconfig/s390x/CONFIG_DMADEVICES
deleted file mode 100644
index 6596e80fc..000000000
--- a/baseconfig/s390x/CONFIG_DMADEVICES
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DMADEVICES is not set
diff --git a/baseconfig/s390x/CONFIG_DNET b/baseconfig/s390x/CONFIG_DNET
deleted file mode 100644
index f8ac68f29..000000000
--- a/baseconfig/s390x/CONFIG_DNET
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DNET is not set
diff --git a/baseconfig/s390x/CONFIG_DP83640_PHY b/baseconfig/s390x/CONFIG_DP83640_PHY
deleted file mode 100644
index 24a3a8f31..000000000
--- a/baseconfig/s390x/CONFIG_DP83640_PHY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DP83640_PHY is not set
diff --git a/baseconfig/s390x/CONFIG_DRM b/baseconfig/s390x/CONFIG_DRM
deleted file mode 100644
index c9d4b0f66..000000000
--- a/baseconfig/s390x/CONFIG_DRM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM is not set
diff --git a/baseconfig/s390x/CONFIG_DW_DMAC b/baseconfig/s390x/CONFIG_DW_DMAC
deleted file mode 100644
index 3e9fc9b1e..000000000
--- a/baseconfig/s390x/CONFIG_DW_DMAC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DW_DMAC is not set
diff --git a/baseconfig/s390x/CONFIG_EADM_SCH b/baseconfig/s390x/CONFIG_EADM_SCH
deleted file mode 100644
index edf22b79f..000000000
--- a/baseconfig/s390x/CONFIG_EADM_SCH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EADM_SCH=m
diff --git a/baseconfig/s390x/CONFIG_ECHO b/baseconfig/s390x/CONFIG_ECHO
deleted file mode 100644
index b84a07b07..000000000
--- a/baseconfig/s390x/CONFIG_ECHO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ECHO is not set
diff --git a/baseconfig/s390x/CONFIG_EMU_SIZE b/baseconfig/s390x/CONFIG_EMU_SIZE
deleted file mode 100644
index 116273f0c..000000000
--- a/baseconfig/s390x/CONFIG_EMU_SIZE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EMU_SIZE=0x10000000
diff --git a/baseconfig/s390x/CONFIG_ENCLOSURE_SERVICES b/baseconfig/s390x/CONFIG_ENCLOSURE_SERVICES
deleted file mode 100644
index b463632aa..000000000
--- a/baseconfig/s390x/CONFIG_ENCLOSURE_SERVICES
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ENCLOSURE_SERVICES is not set
diff --git a/baseconfig/s390x/CONFIG_ETHOC b/baseconfig/s390x/CONFIG_ETHOC
deleted file mode 100644
index 15370ca02..000000000
--- a/baseconfig/s390x/CONFIG_ETHOC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ETHOC is not set
diff --git a/baseconfig/s390x/CONFIG_FB b/baseconfig/s390x/CONFIG_FB
deleted file mode 100644
index 7310c1a02..000000000
--- a/baseconfig/s390x/CONFIG_FB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB is not set
diff --git a/baseconfig/s390x/CONFIG_FCOE b/baseconfig/s390x/CONFIG_FCOE
deleted file mode 100644
index 5b97d8ed5..000000000
--- a/baseconfig/s390x/CONFIG_FCOE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FCOE is not set
diff --git a/baseconfig/s390x/CONFIG_FDDI b/baseconfig/s390x/CONFIG_FDDI
deleted file mode 100644
index e13f968a5..000000000
--- a/baseconfig/s390x/CONFIG_FDDI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FDDI is not set
diff --git a/baseconfig/s390x/CONFIG_FEALNX b/baseconfig/s390x/CONFIG_FEALNX
deleted file mode 100644
index 4cca6a26d..000000000
--- a/baseconfig/s390x/CONFIG_FEALNX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FEALNX is not set
diff --git a/baseconfig/s390x/CONFIG_FIREWIRE b/baseconfig/s390x/CONFIG_FIREWIRE
deleted file mode 100644
index d75b839c4..000000000
--- a/baseconfig/s390x/CONFIG_FIREWIRE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FIREWIRE is not set
diff --git a/baseconfig/s390x/CONFIG_FIREWIRE_NOSY b/baseconfig/s390x/CONFIG_FIREWIRE_NOSY
deleted file mode 100644
index 0b48c48d1..000000000
--- a/baseconfig/s390x/CONFIG_FIREWIRE_NOSY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FIREWIRE_NOSY is not set
diff --git a/baseconfig/s390x/CONFIG_FIXED_PHY b/baseconfig/s390x/CONFIG_FIXED_PHY
deleted file mode 100644
index 89309ed1e..000000000
--- a/baseconfig/s390x/CONFIG_FIXED_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FIXED_PHY=m
diff --git a/baseconfig/s390x/CONFIG_FMC b/baseconfig/s390x/CONFIG_FMC
deleted file mode 100644
index 674cd4432..000000000
--- a/baseconfig/s390x/CONFIG_FMC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FMC is not set
diff --git a/baseconfig/s390x/CONFIG_FUSION b/baseconfig/s390x/CONFIG_FUSION
deleted file mode 100644
index 116c04ea7..000000000
--- a/baseconfig/s390x/CONFIG_FUSION
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FUSION is not set
diff --git a/baseconfig/s390x/CONFIG_GAMEPORT b/baseconfig/s390x/CONFIG_GAMEPORT
deleted file mode 100644
index 03c782bf3..000000000
--- a/baseconfig/s390x/CONFIG_GAMEPORT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GAMEPORT is not set
diff --git a/baseconfig/s390x/CONFIG_GENERIC_PHY b/baseconfig/s390x/CONFIG_GENERIC_PHY
deleted file mode 100644
index 40cd1a4f5..000000000
--- a/baseconfig/s390x/CONFIG_GENERIC_PHY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GENERIC_PHY=y
diff --git a/baseconfig/s390x/CONFIG_GENWQE b/baseconfig/s390x/CONFIG_GENWQE
deleted file mode 100644
index f1f996ac1..000000000
--- a/baseconfig/s390x/CONFIG_GENWQE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GENWQE=m
diff --git a/baseconfig/s390x/CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY b/baseconfig/s390x/CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY
deleted file mode 100644
index b7d077774..000000000
--- a/baseconfig/s390x/CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
diff --git a/baseconfig/s390x/CONFIG_GPIOLIB b/baseconfig/s390x/CONFIG_GPIOLIB
deleted file mode 100644
index 6e685b2be..000000000
--- a/baseconfig/s390x/CONFIG_GPIOLIB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_GPIOLIB is not set
diff --git a/baseconfig/s390x/CONFIG_HID b/baseconfig/s390x/CONFIG_HID
deleted file mode 100644
index befe82811..000000000
--- a/baseconfig/s390x/CONFIG_HID
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_HID is not set
diff --git a/baseconfig/s390x/CONFIG_HID_GENERIC b/baseconfig/s390x/CONFIG_HID_GENERIC
deleted file mode 100644
index a281e1c08..000000000
--- a/baseconfig/s390x/CONFIG_HID_GENERIC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HID_GENERIC=m
diff --git a/baseconfig/s390x/CONFIG_HID_MAGICMOUSE b/baseconfig/s390x/CONFIG_HID_MAGICMOUSE
deleted file mode 100644
index 60e3719f1..000000000
--- a/baseconfig/s390x/CONFIG_HID_MAGICMOUSE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HID_MAGICMOUSE=m
diff --git a/baseconfig/s390x/CONFIG_HIPPI b/baseconfig/s390x/CONFIG_HIPPI
deleted file mode 100644
index 8f4d0983a..000000000
--- a/baseconfig/s390x/CONFIG_HIPPI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_HIPPI is not set
diff --git a/baseconfig/s390x/CONFIG_HOTPLUG_PCI_CPCI b/baseconfig/s390x/CONFIG_HOTPLUG_PCI_CPCI
deleted file mode 100644
index f8bcc7104..000000000
--- a/baseconfig/s390x/CONFIG_HOTPLUG_PCI_CPCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HOTPLUG_PCI_CPCI=y
diff --git a/baseconfig/s390x/CONFIG_HOTPLUG_PCI_S390 b/baseconfig/s390x/CONFIG_HOTPLUG_PCI_S390
deleted file mode 100644
index 4231dadcb..000000000
--- a/baseconfig/s390x/CONFIG_HOTPLUG_PCI_S390
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HOTPLUG_PCI_S390=y
diff --git a/baseconfig/s390x/CONFIG_HOTPLUG_PCI_SHPC b/baseconfig/s390x/CONFIG_HOTPLUG_PCI_SHPC
deleted file mode 100644
index 4380a9717..000000000
--- a/baseconfig/s390x/CONFIG_HOTPLUG_PCI_SHPC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HOTPLUG_PCI_SHPC=y
diff --git a/baseconfig/s390x/CONFIG_HVC_IUCV b/baseconfig/s390x/CONFIG_HVC_IUCV
deleted file mode 100644
index 1ba599113..000000000
--- a/baseconfig/s390x/CONFIG_HVC_IUCV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HVC_IUCV=y
diff --git a/baseconfig/s390x/CONFIG_HWMON b/baseconfig/s390x/CONFIG_HWMON
deleted file mode 100644
index 65c3ac9f5..000000000
--- a/baseconfig/s390x/CONFIG_HWMON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_HWMON is not set
diff --git a/baseconfig/s390x/CONFIG_HW_RANDOM_S390 b/baseconfig/s390x/CONFIG_HW_RANDOM_S390
deleted file mode 100644
index 7108db8ff..000000000
--- a/baseconfig/s390x/CONFIG_HW_RANDOM_S390
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HW_RANDOM_S390=m
diff --git a/baseconfig/s390x/CONFIG_HZ_100 b/baseconfig/s390x/CONFIG_HZ_100
deleted file mode 100644
index 11bd2afa2..000000000
--- a/baseconfig/s390x/CONFIG_HZ_100
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HZ_100=y
diff --git a/baseconfig/s390x/CONFIG_HZ_1000 b/baseconfig/s390x/CONFIG_HZ_1000
deleted file mode 100644
index c211724d6..000000000
--- a/baseconfig/s390x/CONFIG_HZ_1000
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_HZ_1000 is not set
diff --git a/baseconfig/s390x/CONFIG_I2C b/baseconfig/s390x/CONFIG_I2C
deleted file mode 100644
index 063fe8213..000000000
--- a/baseconfig/s390x/CONFIG_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_I2C=m
diff --git a/baseconfig/s390x/CONFIG_I2C_ALGOBIT b/baseconfig/s390x/CONFIG_I2C_ALGOBIT
deleted file mode 100644
index e374ebd3c..000000000
--- a/baseconfig/s390x/CONFIG_I2C_ALGOBIT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_ALGOBIT is not set
diff --git a/baseconfig/s390x/CONFIG_I2C_ALGOPCA b/baseconfig/s390x/CONFIG_I2C_ALGOPCA
deleted file mode 100644
index 545b72f08..000000000
--- a/baseconfig/s390x/CONFIG_I2C_ALGOPCA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_ALGOPCA is not set
diff --git a/baseconfig/s390x/CONFIG_I2C_ALGOPCF b/baseconfig/s390x/CONFIG_I2C_ALGOPCF
deleted file mode 100644
index cdb960f9c..000000000
--- a/baseconfig/s390x/CONFIG_I2C_ALGOPCF
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_ALGOPCF is not set
diff --git a/baseconfig/s390x/CONFIG_I2C_CHARDEV b/baseconfig/s390x/CONFIG_I2C_CHARDEV
deleted file mode 100644
index 78053559f..000000000
--- a/baseconfig/s390x/CONFIG_I2C_CHARDEV
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_CHARDEV is not set
diff --git a/baseconfig/s390x/CONFIG_I2C_COMPAT b/baseconfig/s390x/CONFIG_I2C_COMPAT
deleted file mode 100644
index c82c4eb35..000000000
--- a/baseconfig/s390x/CONFIG_I2C_COMPAT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_COMPAT is not set
diff --git a/baseconfig/s390x/CONFIG_I2C_DESIGNWARE_PCI b/baseconfig/s390x/CONFIG_I2C_DESIGNWARE_PCI
deleted file mode 100644
index 7f371b4dc..000000000
--- a/baseconfig/s390x/CONFIG_I2C_DESIGNWARE_PCI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_DESIGNWARE_PCI is not set
diff --git a/baseconfig/s390x/CONFIG_I2C_HELPER_AUTO b/baseconfig/s390x/CONFIG_I2C_HELPER_AUTO
deleted file mode 100644
index 335f57499..000000000
--- a/baseconfig/s390x/CONFIG_I2C_HELPER_AUTO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_HELPER_AUTO is not set
diff --git a/baseconfig/s390x/CONFIG_I2C_HID b/baseconfig/s390x/CONFIG_I2C_HID
deleted file mode 100644
index 30ca18a84..000000000
--- a/baseconfig/s390x/CONFIG_I2C_HID
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_HID is not set
diff --git a/baseconfig/s390x/CONFIG_I2C_NFORCE2 b/baseconfig/s390x/CONFIG_I2C_NFORCE2
deleted file mode 100644
index e5e898994..000000000
--- a/baseconfig/s390x/CONFIG_I2C_NFORCE2
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_NFORCE2 is not set
diff --git a/baseconfig/s390x/CONFIG_I2C_PCA_PLATFORM b/baseconfig/s390x/CONFIG_I2C_PCA_PLATFORM
deleted file mode 100644
index e371d1a8e..000000000
--- a/baseconfig/s390x/CONFIG_I2C_PCA_PLATFORM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_PCA_PLATFORM is not set
diff --git a/baseconfig/s390x/CONFIG_I2C_SIMTEC b/baseconfig/s390x/CONFIG_I2C_SIMTEC
deleted file mode 100644
index 1fe634955..000000000
--- a/baseconfig/s390x/CONFIG_I2C_SIMTEC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_SIMTEC is not set
diff --git a/baseconfig/s390x/CONFIG_I2C_SLAVE b/baseconfig/s390x/CONFIG_I2C_SLAVE
deleted file mode 100644
index 364b36792..000000000
--- a/baseconfig/s390x/CONFIG_I2C_SLAVE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_SLAVE is not set
diff --git a/baseconfig/s390x/CONFIG_I2C_SMBUS b/baseconfig/s390x/CONFIG_I2C_SMBUS
deleted file mode 100644
index 52c7942fc..000000000
--- a/baseconfig/s390x/CONFIG_I2C_SMBUS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_SMBUS is not set
diff --git a/baseconfig/s390x/CONFIG_I2C_STUB b/baseconfig/s390x/CONFIG_I2C_STUB
deleted file mode 100644
index a8b196bb9..000000000
--- a/baseconfig/s390x/CONFIG_I2C_STUB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_STUB is not set
diff --git a/baseconfig/s390x/CONFIG_I6300ESB_WDT b/baseconfig/s390x/CONFIG_I6300ESB_WDT
deleted file mode 100644
index 8c7bc0f55..000000000
--- a/baseconfig/s390x/CONFIG_I6300ESB_WDT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I6300ESB_WDT is not set
diff --git a/baseconfig/s390x/CONFIG_IBM_PARTITION b/baseconfig/s390x/CONFIG_IBM_PARTITION
deleted file mode 100644
index 185080d3d..000000000
--- a/baseconfig/s390x/CONFIG_IBM_PARTITION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IBM_PARTITION=y
diff --git a/baseconfig/s390x/CONFIG_IEEE802154_DRIVERS b/baseconfig/s390x/CONFIG_IEEE802154_DRIVERS
deleted file mode 100644
index 60a8297da..000000000
--- a/baseconfig/s390x/CONFIG_IEEE802154_DRIVERS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IEEE802154_DRIVERS is not set
diff --git a/baseconfig/s390x/CONFIG_IIO b/baseconfig/s390x/CONFIG_IIO
deleted file mode 100644
index 80d289815..000000000
--- a/baseconfig/s390x/CONFIG_IIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IIO is not set
diff --git a/baseconfig/s390x/CONFIG_INFINIBAND_CXGB3 b/baseconfig/s390x/CONFIG_INFINIBAND_CXGB3
deleted file mode 100644
index f06c87360..000000000
--- a/baseconfig/s390x/CONFIG_INFINIBAND_CXGB3
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INFINIBAND_CXGB3 is not set
diff --git a/baseconfig/s390x/CONFIG_INFINIBAND_CXGB4 b/baseconfig/s390x/CONFIG_INFINIBAND_CXGB4
deleted file mode 100644
index 40ff06894..000000000
--- a/baseconfig/s390x/CONFIG_INFINIBAND_CXGB4
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INFINIBAND_CXGB4 is not set
diff --git a/baseconfig/s390x/CONFIG_INFINIBAND_MTHCA b/baseconfig/s390x/CONFIG_INFINIBAND_MTHCA
deleted file mode 100644
index a134e36a3..000000000
--- a/baseconfig/s390x/CONFIG_INFINIBAND_MTHCA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INFINIBAND_MTHCA is not set
diff --git a/baseconfig/s390x/CONFIG_INFINIBAND_NES b/baseconfig/s390x/CONFIG_INFINIBAND_NES
deleted file mode 100644
index eee505590..000000000
--- a/baseconfig/s390x/CONFIG_INFINIBAND_NES
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INFINIBAND_NES is not set
diff --git a/baseconfig/s390x/CONFIG_INFINIBAND_OCRDMA b/baseconfig/s390x/CONFIG_INFINIBAND_OCRDMA
deleted file mode 100644
index 12ff35161..000000000
--- a/baseconfig/s390x/CONFIG_INFINIBAND_OCRDMA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INFINIBAND_OCRDMA is not set
diff --git a/baseconfig/s390x/CONFIG_INFINIBAND_QIB b/baseconfig/s390x/CONFIG_INFINIBAND_QIB
deleted file mode 100644
index 591f4e962..000000000
--- a/baseconfig/s390x/CONFIG_INFINIBAND_QIB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INFINIBAND_QIB is not set
diff --git a/baseconfig/s390x/CONFIG_INPUT_FF_MEMLESS b/baseconfig/s390x/CONFIG_INPUT_FF_MEMLESS
deleted file mode 100644
index 340af6632..000000000
--- a/baseconfig/s390x/CONFIG_INPUT_FF_MEMLESS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_FF_MEMLESS is not set
diff --git a/baseconfig/s390x/CONFIG_INPUT_JOYDEV b/baseconfig/s390x/CONFIG_INPUT_JOYDEV
deleted file mode 100644
index f0730fa08..000000000
--- a/baseconfig/s390x/CONFIG_INPUT_JOYDEV
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_JOYDEV is not set
diff --git a/baseconfig/s390x/CONFIG_INPUT_JOYSTICK b/baseconfig/s390x/CONFIG_INPUT_JOYSTICK
deleted file mode 100644
index 6f75cf815..000000000
--- a/baseconfig/s390x/CONFIG_INPUT_JOYSTICK
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_JOYSTICK is not set
diff --git a/baseconfig/s390x/CONFIG_INPUT_KEYBOARD b/baseconfig/s390x/CONFIG_INPUT_KEYBOARD
deleted file mode 100644
index 261c77fab..000000000
--- a/baseconfig/s390x/CONFIG_INPUT_KEYBOARD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_KEYBOARD is not set
diff --git a/baseconfig/s390x/CONFIG_INPUT_MISC b/baseconfig/s390x/CONFIG_INPUT_MISC
deleted file mode 100644
index f9ad3d4b7..000000000
--- a/baseconfig/s390x/CONFIG_INPUT_MISC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_MISC is not set
diff --git a/baseconfig/s390x/CONFIG_INPUT_MOUSE b/baseconfig/s390x/CONFIG_INPUT_MOUSE
deleted file mode 100644
index f66060a96..000000000
--- a/baseconfig/s390x/CONFIG_INPUT_MOUSE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_MOUSE is not set
diff --git a/baseconfig/s390x/CONFIG_INPUT_MOUSEDEV b/baseconfig/s390x/CONFIG_INPUT_MOUSEDEV
deleted file mode 100644
index 1afcd1e58..000000000
--- a/baseconfig/s390x/CONFIG_INPUT_MOUSEDEV
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_MOUSEDEV is not set
diff --git a/baseconfig/s390x/CONFIG_INPUT_POLLDEV b/baseconfig/s390x/CONFIG_INPUT_POLLDEV
deleted file mode 100644
index 3d67d3920..000000000
--- a/baseconfig/s390x/CONFIG_INPUT_POLLDEV
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_POLLDEV is not set
diff --git a/baseconfig/s390x/CONFIG_INPUT_SPARSEKMAP b/baseconfig/s390x/CONFIG_INPUT_SPARSEKMAP
deleted file mode 100644
index dce3d03cc..000000000
--- a/baseconfig/s390x/CONFIG_INPUT_SPARSEKMAP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_SPARSEKMAP is not set
diff --git a/baseconfig/s390x/CONFIG_INPUT_TABLET b/baseconfig/s390x/CONFIG_INPUT_TABLET
deleted file mode 100644
index ea8f01dfa..000000000
--- a/baseconfig/s390x/CONFIG_INPUT_TABLET
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_TABLET is not set
diff --git a/baseconfig/s390x/CONFIG_INPUT_TOUCHSCREEN b/baseconfig/s390x/CONFIG_INPUT_TOUCHSCREEN
deleted file mode 100644
index e74a7dfb0..000000000
--- a/baseconfig/s390x/CONFIG_INPUT_TOUCHSCREEN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INPUT_TOUCHSCREEN is not set
diff --git a/baseconfig/s390x/CONFIG_IP1000 b/baseconfig/s390x/CONFIG_IP1000
deleted file mode 100644
index 179adb3cc..000000000
--- a/baseconfig/s390x/CONFIG_IP1000
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IP1000 is not set
diff --git a/baseconfig/s390x/CONFIG_IPL b/baseconfig/s390x/CONFIG_IPL
deleted file mode 100644
index a2b627a25..000000000
--- a/baseconfig/s390x/CONFIG_IPL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IPL=y
diff --git a/baseconfig/s390x/CONFIG_IRDA b/baseconfig/s390x/CONFIG_IRDA
deleted file mode 100644
index 54366a325..000000000
--- a/baseconfig/s390x/CONFIG_IRDA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IRDA is not set
diff --git a/baseconfig/s390x/CONFIG_IRQ_DOMAIN_DEBUG b/baseconfig/s390x/CONFIG_IRQ_DOMAIN_DEBUG
deleted file mode 100644
index a5e0c1f27..000000000
--- a/baseconfig/s390x/CONFIG_IRQ_DOMAIN_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IRQ_DOMAIN_DEBUG=y
diff --git a/baseconfig/s390x/CONFIG_ISL29003 b/baseconfig/s390x/CONFIG_ISL29003
deleted file mode 100644
index 266725319..000000000
--- a/baseconfig/s390x/CONFIG_ISL29003
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ISL29003 is not set
diff --git a/baseconfig/s390x/CONFIG_ISL29020 b/baseconfig/s390x/CONFIG_ISL29020
deleted file mode 100644
index abf4d72ad..000000000
--- a/baseconfig/s390x/CONFIG_ISL29020
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ISL29020 is not set
diff --git a/baseconfig/s390x/CONFIG_IUCV b/baseconfig/s390x/CONFIG_IUCV
deleted file mode 100644
index 2ee374ce1..000000000
--- a/baseconfig/s390x/CONFIG_IUCV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IUCV=y
diff --git a/baseconfig/s390x/CONFIG_JME b/baseconfig/s390x/CONFIG_JME
deleted file mode 100644
index 63c5aeb65..000000000
--- a/baseconfig/s390x/CONFIG_JME
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_JME is not set
diff --git a/baseconfig/s390x/CONFIG_KVM b/baseconfig/s390x/CONFIG_KVM
deleted file mode 100644
index cf9bf67a6..000000000
--- a/baseconfig/s390x/CONFIG_KVM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_KVM=m
diff --git a/baseconfig/s390x/CONFIG_KVM_S390_UCONTROL b/baseconfig/s390x/CONFIG_KVM_S390_UCONTROL
deleted file mode 100644
index f3f4b4f19..000000000
--- a/baseconfig/s390x/CONFIG_KVM_S390_UCONTROL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_KVM_S390_UCONTROL is not set
diff --git a/baseconfig/s390x/CONFIG_LCD_CLASS_DEVICE b/baseconfig/s390x/CONFIG_LCD_CLASS_DEVICE
deleted file mode 100644
index 31706ec23..000000000
--- a/baseconfig/s390x/CONFIG_LCD_CLASS_DEVICE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_LCD_CLASS_DEVICE is not set
diff --git a/baseconfig/s390x/CONFIG_LCD_PLATFORM b/baseconfig/s390x/CONFIG_LCD_PLATFORM
deleted file mode 100644
index 893e27a06..000000000
--- a/baseconfig/s390x/CONFIG_LCD_PLATFORM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_LCD_PLATFORM is not set
diff --git a/baseconfig/s390x/CONFIG_LCS b/baseconfig/s390x/CONFIG_LCS
deleted file mode 100644
index 3bfb17f62..000000000
--- a/baseconfig/s390x/CONFIG_LCS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LCS=m
diff --git a/baseconfig/s390x/CONFIG_LOG_BUF_SHIFT b/baseconfig/s390x/CONFIG_LOG_BUF_SHIFT
deleted file mode 100644
index ab5954c55..000000000
--- a/baseconfig/s390x/CONFIG_LOG_BUF_SHIFT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LOG_BUF_SHIFT=16
diff --git a/baseconfig/s390x/CONFIG_MAC80211 b/baseconfig/s390x/CONFIG_MAC80211
deleted file mode 100644
index c7003d712..000000000
--- a/baseconfig/s390x/CONFIG_MAC80211
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MAC80211 is not set
diff --git a/baseconfig/s390x/CONFIG_MAC_PARTITION b/baseconfig/s390x/CONFIG_MAC_PARTITION
deleted file mode 100644
index b6cee5057..000000000
--- a/baseconfig/s390x/CONFIG_MAC_PARTITION
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MAC_PARTITION is not set
diff --git a/baseconfig/s390x/CONFIG_MARCH_ZEC12 b/baseconfig/s390x/CONFIG_MARCH_ZEC12
deleted file mode 100644
index 7dbcbb3f9..000000000
--- a/baseconfig/s390x/CONFIG_MARCH_ZEC12
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MARCH_ZEC12=y
diff --git a/baseconfig/s390x/CONFIG_MAX_PHYSMEM_BITS b/baseconfig/s390x/CONFIG_MAX_PHYSMEM_BITS
deleted file mode 100644
index 6ace7a163..000000000
--- a/baseconfig/s390x/CONFIG_MAX_PHYSMEM_BITS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MAX_PHYSMEM_BITS=46
diff --git a/baseconfig/s390x/CONFIG_MDIO_DEVICE b/baseconfig/s390x/CONFIG_MDIO_DEVICE
deleted file mode 100644
index 67ac6bad8..000000000
--- a/baseconfig/s390x/CONFIG_MDIO_DEVICE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MDIO_DEVICE=m
diff --git a/baseconfig/s390x/CONFIG_MEDIA_SUPPORT b/baseconfig/s390x/CONFIG_MEDIA_SUPPORT
deleted file mode 100644
index 0348bacd1..000000000
--- a/baseconfig/s390x/CONFIG_MEDIA_SUPPORT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MEDIA_SUPPORT is not set
diff --git a/baseconfig/s390x/CONFIG_MEGARAID_LEGACY b/baseconfig/s390x/CONFIG_MEGARAID_LEGACY
deleted file mode 100644
index 3109de7c1..000000000
--- a/baseconfig/s390x/CONFIG_MEGARAID_LEGACY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MEGARAID_LEGACY is not set
diff --git a/baseconfig/s390x/CONFIG_MEGARAID_NEWGEN b/baseconfig/s390x/CONFIG_MEGARAID_NEWGEN
deleted file mode 100644
index a132e5f39..000000000
--- a/baseconfig/s390x/CONFIG_MEGARAID_NEWGEN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MEGARAID_NEWGEN is not set
diff --git a/baseconfig/s390x/CONFIG_MEGARAID_SAS b/baseconfig/s390x/CONFIG_MEGARAID_SAS
deleted file mode 100644
index 94dae93a5..000000000
--- a/baseconfig/s390x/CONFIG_MEGARAID_SAS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MEGARAID_SAS is not set
diff --git a/baseconfig/s390x/CONFIG_MEMORY_HOTPLUG b/baseconfig/s390x/CONFIG_MEMORY_HOTPLUG
deleted file mode 100644
index ff75139e0..000000000
--- a/baseconfig/s390x/CONFIG_MEMORY_HOTPLUG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MEMORY_HOTPLUG=y
diff --git a/baseconfig/s390x/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE b/baseconfig/s390x/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
deleted file mode 100644
index bbbf7d364..000000000
--- a/baseconfig/s390x/CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
diff --git a/baseconfig/s390x/CONFIG_MEMORY_HOTREMOVE b/baseconfig/s390x/CONFIG_MEMORY_HOTREMOVE
deleted file mode 100644
index 362150e69..000000000
--- a/baseconfig/s390x/CONFIG_MEMORY_HOTREMOVE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MEMORY_HOTREMOVE=y
diff --git a/baseconfig/s390x/CONFIG_MEMSTICK b/baseconfig/s390x/CONFIG_MEMSTICK
deleted file mode 100644
index c18606e43..000000000
--- a/baseconfig/s390x/CONFIG_MEMSTICK
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MEMSTICK is not set
diff --git a/baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY b/baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY
deleted file mode 100644
index 356f2edd8..000000000
--- a/baseconfig/s390x/CONFIG_MEM_SOFT_DIRTY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MEM_SOFT_DIRTY=y
diff --git a/baseconfig/s390x/CONFIG_MFD_BD9571MWV b/baseconfig/s390x/CONFIG_MFD_BD9571MWV
deleted file mode 100644
index d321ad3c6..000000000
--- a/baseconfig/s390x/CONFIG_MFD_BD9571MWV
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_BD9571MWV is not set
diff --git a/baseconfig/s390x/CONFIG_MFD_CORE b/baseconfig/s390x/CONFIG_MFD_CORE
deleted file mode 100644
index 61d91aa6e..000000000
--- a/baseconfig/s390x/CONFIG_MFD_CORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_CORE is not set
diff --git a/baseconfig/s390x/CONFIG_MFD_RTSX_PCI b/baseconfig/s390x/CONFIG_MFD_RTSX_PCI
deleted file mode 100644
index 03cefd786..000000000
--- a/baseconfig/s390x/CONFIG_MFD_RTSX_PCI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_RTSX_PCI is not set
diff --git a/baseconfig/s390x/CONFIG_MFD_RTSX_USB b/baseconfig/s390x/CONFIG_MFD_RTSX_USB
deleted file mode 100644
index b6efa65e7..000000000
--- a/baseconfig/s390x/CONFIG_MFD_RTSX_USB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_RTSX_USB is not set
diff --git a/baseconfig/s390x/CONFIG_MFD_SM501 b/baseconfig/s390x/CONFIG_MFD_SM501
deleted file mode 100644
index 1a0ec3f74..000000000
--- a/baseconfig/s390x/CONFIG_MFD_SM501
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_SM501 is not set
diff --git a/baseconfig/s390x/CONFIG_MFD_TPS68470 b/baseconfig/s390x/CONFIG_MFD_TPS68470
deleted file mode 100644
index e82f415aa..000000000
--- a/baseconfig/s390x/CONFIG_MFD_TPS68470
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_TPS68470 is not set
diff --git a/baseconfig/s390x/CONFIG_MFD_VIPERBOARD b/baseconfig/s390x/CONFIG_MFD_VIPERBOARD
deleted file mode 100644
index 1d4d00579..000000000
--- a/baseconfig/s390x/CONFIG_MFD_VIPERBOARD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_VIPERBOARD is not set
diff --git a/baseconfig/s390x/CONFIG_MFD_VX855 b/baseconfig/s390x/CONFIG_MFD_VX855
deleted file mode 100644
index 8c01f8ec1..000000000
--- a/baseconfig/s390x/CONFIG_MFD_VX855
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_VX855 is not set
diff --git a/baseconfig/s390x/CONFIG_MFD_WL1273_CORE b/baseconfig/s390x/CONFIG_MFD_WL1273_CORE
deleted file mode 100644
index cfdc6c17b..000000000
--- a/baseconfig/s390x/CONFIG_MFD_WL1273_CORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_WL1273_CORE is not set
diff --git a/baseconfig/s390x/CONFIG_MISDN_HFCMULTI b/baseconfig/s390x/CONFIG_MISDN_HFCMULTI
deleted file mode 100644
index c09baa6b4..000000000
--- a/baseconfig/s390x/CONFIG_MISDN_HFCMULTI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MISDN_HFCMULTI is not set
diff --git a/baseconfig/s390x/CONFIG_MLXSW_CORE b/baseconfig/s390x/CONFIG_MLXSW_CORE
deleted file mode 100644
index 31431cecf..000000000
--- a/baseconfig/s390x/CONFIG_MLXSW_CORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MLXSW_CORE is not set
diff --git a/baseconfig/s390x/CONFIG_MMC b/baseconfig/s390x/CONFIG_MMC
deleted file mode 100644
index 5174d5475..000000000
--- a/baseconfig/s390x/CONFIG_MMC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MMC is not set
diff --git a/baseconfig/s390x/CONFIG_MONREADER b/baseconfig/s390x/CONFIG_MONREADER
deleted file mode 100644
index e5e7e6da0..000000000
--- a/baseconfig/s390x/CONFIG_MONREADER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MONREADER=m
diff --git a/baseconfig/s390x/CONFIG_MONWRITER b/baseconfig/s390x/CONFIG_MONWRITER
deleted file mode 100644
index ba2b6533f..000000000
--- a/baseconfig/s390x/CONFIG_MONWRITER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MONWRITER=m
diff --git a/baseconfig/s390x/CONFIG_MSDOS_PARTITION b/baseconfig/s390x/CONFIG_MSDOS_PARTITION
deleted file mode 100644
index dda339291..000000000
--- a/baseconfig/s390x/CONFIG_MSDOS_PARTITION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MSDOS_PARTITION=y
diff --git a/baseconfig/s390x/CONFIG_MTD b/baseconfig/s390x/CONFIG_MTD
deleted file mode 100644
index f29845573..000000000
--- a/baseconfig/s390x/CONFIG_MTD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MTD is not set
diff --git a/baseconfig/s390x/CONFIG_NETCONSOLE b/baseconfig/s390x/CONFIG_NETCONSOLE
deleted file mode 100644
index 37ec75b06..000000000
--- a/baseconfig/s390x/CONFIG_NETCONSOLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NETCONSOLE=m
diff --git a/baseconfig/s390x/CONFIG_NETIUCV b/baseconfig/s390x/CONFIG_NETIUCV
deleted file mode 100644
index d2de263dc..000000000
--- a/baseconfig/s390x/CONFIG_NETIUCV
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NETIUCV is not set
diff --git a/baseconfig/s390x/CONFIG_NET_CADENCE b/baseconfig/s390x/CONFIG_NET_CADENCE
deleted file mode 100644
index 8d2c645c2..000000000
--- a/baseconfig/s390x/CONFIG_NET_CADENCE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_CADENCE is not set
diff --git a/baseconfig/s390x/CONFIG_NET_PACKET_ENGINE b/baseconfig/s390x/CONFIG_NET_PACKET_ENGINE
deleted file mode 100644
index 3ed79f437..000000000
--- a/baseconfig/s390x/CONFIG_NET_PACKET_ENGINE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_PACKET_ENGINE is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_3COM b/baseconfig/s390x/CONFIG_NET_VENDOR_3COM
deleted file mode 100644
index ed6108c18..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_3COM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_3COM is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_8390 b/baseconfig/s390x/CONFIG_NET_VENDOR_8390
deleted file mode 100644
index d0b9f3592..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_8390
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_8390 is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_ADAPTEC b/baseconfig/s390x/CONFIG_NET_VENDOR_ADAPTEC
deleted file mode 100644
index c96958732..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_ADAPTEC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_ADAPTEC is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_AGERE b/baseconfig/s390x/CONFIG_NET_VENDOR_AGERE
deleted file mode 100644
index 3647271ce..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_AGERE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_AGERE is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_ALTEON b/baseconfig/s390x/CONFIG_NET_VENDOR_ALTEON
deleted file mode 100644
index 88beca48e..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_ALTEON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_ALTEON is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_AMAZON b/baseconfig/s390x/CONFIG_NET_VENDOR_AMAZON
deleted file mode 100644
index 707bb5a54..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_AMAZON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_AMAZON is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_AMD b/baseconfig/s390x/CONFIG_NET_VENDOR_AMD
deleted file mode 100644
index 606381824..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_AMD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_AMD is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_ARC b/baseconfig/s390x/CONFIG_NET_VENDOR_ARC
deleted file mode 100644
index 98de35136..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_ARC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_ARC is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_ATHEROS b/baseconfig/s390x/CONFIG_NET_VENDOR_ATHEROS
deleted file mode 100644
index 9a99ac7fc..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_ATHEROS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_ATHEROS is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_BROADCOM b/baseconfig/s390x/CONFIG_NET_VENDOR_BROADCOM
deleted file mode 100644
index 7cd9cb32f..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_BROADCOM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_BROADCOM is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_BROCADE b/baseconfig/s390x/CONFIG_NET_VENDOR_BROCADE
deleted file mode 100644
index fed5e48a4..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_BROCADE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_BROCADE is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_CHELSIO b/baseconfig/s390x/CONFIG_NET_VENDOR_CHELSIO
deleted file mode 100644
index 71374072a..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_CHELSIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_CHELSIO is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_CISCO b/baseconfig/s390x/CONFIG_NET_VENDOR_CISCO
deleted file mode 100644
index 7b4bdaa25..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_CISCO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_CISCO is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_DEC b/baseconfig/s390x/CONFIG_NET_VENDOR_DEC
deleted file mode 100644
index 7c3a697fb..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_DEC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_DEC is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_DLINK b/baseconfig/s390x/CONFIG_NET_VENDOR_DLINK
deleted file mode 100644
index 181e6a008..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_DLINK
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_DLINK is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_EMULEX b/baseconfig/s390x/CONFIG_NET_VENDOR_EMULEX
deleted file mode 100644
index e48620d8d..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_EMULEX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_EMULEX is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_EXAR b/baseconfig/s390x/CONFIG_NET_VENDOR_EXAR
deleted file mode 100644
index 90a6a31bb..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_EXAR
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_EXAR is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_HP b/baseconfig/s390x/CONFIG_NET_VENDOR_HP
deleted file mode 100644
index 30f3b4050..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_HP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_HP is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_INTEL b/baseconfig/s390x/CONFIG_NET_VENDOR_INTEL
deleted file mode 100644
index 201973acd..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_INTEL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_INTEL is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_MARVELL b/baseconfig/s390x/CONFIG_NET_VENDOR_MARVELL
deleted file mode 100644
index ebe703be2..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_MARVELL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_MARVELL is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_MICREL b/baseconfig/s390x/CONFIG_NET_VENDOR_MICREL
deleted file mode 100644
index d359479e3..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_MICREL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_MICREL is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_MYRI b/baseconfig/s390x/CONFIG_NET_VENDOR_MYRI
deleted file mode 100644
index 03d6c850f..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_MYRI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_MYRI is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_NATSEMI b/baseconfig/s390x/CONFIG_NET_VENDOR_NATSEMI
deleted file mode 100644
index f2bf134ab..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_NATSEMI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_NATSEMI is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_NETRONOME b/baseconfig/s390x/CONFIG_NET_VENDOR_NETRONOME
deleted file mode 100644
index d08e277d0..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_NETRONOME
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_NETRONOME is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_NVIDIA b/baseconfig/s390x/CONFIG_NET_VENDOR_NVIDIA
deleted file mode 100644
index 27ee4d58c..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_NVIDIA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_NVIDIA is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_OKI b/baseconfig/s390x/CONFIG_NET_VENDOR_OKI
deleted file mode 100644
index e6b6bc896..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_OKI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_OKI is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_QLOGIC b/baseconfig/s390x/CONFIG_NET_VENDOR_QLOGIC
deleted file mode 100644
index 700f6a5e2..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_QLOGIC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_QLOGIC is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_RDC b/baseconfig/s390x/CONFIG_NET_VENDOR_RDC
deleted file mode 100644
index 4d84f77dc..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_RDC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_RDC is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_REALTEK b/baseconfig/s390x/CONFIG_NET_VENDOR_REALTEK
deleted file mode 100644
index f21c4dcb0..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_REALTEK
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_REALTEK is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_ROCKER b/baseconfig/s390x/CONFIG_NET_VENDOR_ROCKER
deleted file mode 100644
index ab286d286..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_ROCKER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_ROCKER is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_SEEQ b/baseconfig/s390x/CONFIG_NET_VENDOR_SEEQ
deleted file mode 100644
index 6fe8245eb..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_SEEQ
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_SEEQ is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_SILAN b/baseconfig/s390x/CONFIG_NET_VENDOR_SILAN
deleted file mode 100644
index 07a129493..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_SILAN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_SILAN is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_SIS b/baseconfig/s390x/CONFIG_NET_VENDOR_SIS
deleted file mode 100644
index 5ff2e309b..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_SIS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_SIS is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_SMSC b/baseconfig/s390x/CONFIG_NET_VENDOR_SMSC
deleted file mode 100644
index 4e3e7aec8..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_SMSC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_SMSC is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_STMICRO b/baseconfig/s390x/CONFIG_NET_VENDOR_STMICRO
deleted file mode 100644
index 040f835c6..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_STMICRO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_STMICRO is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_SUN b/baseconfig/s390x/CONFIG_NET_VENDOR_SUN
deleted file mode 100644
index a4ce77875..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_SUN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_SUN is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_TEHUTI b/baseconfig/s390x/CONFIG_NET_VENDOR_TEHUTI
deleted file mode 100644
index 7c0c6ee39..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_TEHUTI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_TEHUTI is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_TI b/baseconfig/s390x/CONFIG_NET_VENDOR_TI
deleted file mode 100644
index a9395e8cc..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_TI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_TI is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_VIA b/baseconfig/s390x/CONFIG_NET_VENDOR_VIA
deleted file mode 100644
index ddca33bb4..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_VIA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_VIA is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_WIZNET b/baseconfig/s390x/CONFIG_NET_VENDOR_WIZNET
deleted file mode 100644
index 08efd75ae..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_WIZNET
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_WIZNET is not set
diff --git a/baseconfig/s390x/CONFIG_NET_VENDOR_XIRCOM b/baseconfig/s390x/CONFIG_NET_VENDOR_XIRCOM
deleted file mode 100644
index 4c2e6f9fd..000000000
--- a/baseconfig/s390x/CONFIG_NET_VENDOR_XIRCOM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NET_VENDOR_XIRCOM is not set
diff --git a/baseconfig/s390x/CONFIG_NEW_LEDS b/baseconfig/s390x/CONFIG_NEW_LEDS
deleted file mode 100644
index 3d1c33f73..000000000
--- a/baseconfig/s390x/CONFIG_NEW_LEDS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NEW_LEDS is not set
diff --git a/baseconfig/s390x/CONFIG_NFC b/baseconfig/s390x/CONFIG_NFC
deleted file mode 100644
index 73cd9395e..000000000
--- a/baseconfig/s390x/CONFIG_NFC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NFC is not set
diff --git a/baseconfig/s390x/CONFIG_NODES_SHIFT b/baseconfig/s390x/CONFIG_NODES_SHIFT
deleted file mode 100644
index 747517623..000000000
--- a/baseconfig/s390x/CONFIG_NODES_SHIFT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NODES_SHIFT=4
diff --git a/baseconfig/s390x/CONFIG_NOZOMI b/baseconfig/s390x/CONFIG_NOZOMI
deleted file mode 100644
index 35ef1afd5..000000000
--- a/baseconfig/s390x/CONFIG_NOZOMI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NOZOMI is not set
diff --git a/baseconfig/s390x/CONFIG_NR_CPUS b/baseconfig/s390x/CONFIG_NR_CPUS
deleted file mode 100644
index fa1ab7e94..000000000
--- a/baseconfig/s390x/CONFIG_NR_CPUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NR_CPUS=64
diff --git a/baseconfig/s390x/CONFIG_NUMA b/baseconfig/s390x/CONFIG_NUMA
deleted file mode 100644
index e480f0c04..000000000
--- a/baseconfig/s390x/CONFIG_NUMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NUMA=y
diff --git a/baseconfig/s390x/CONFIG_NUMA_BALANCING b/baseconfig/s390x/CONFIG_NUMA_BALANCING
deleted file mode 100644
index 9de89d51d..000000000
--- a/baseconfig/s390x/CONFIG_NUMA_BALANCING
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NUMA_BALANCING=y
diff --git a/baseconfig/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED b/baseconfig/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
deleted file mode 100644
index 4b6d5fcee..000000000
--- a/baseconfig/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
diff --git a/baseconfig/s390x/CONFIG_NUMA_EMU b/baseconfig/s390x/CONFIG_NUMA_EMU
deleted file mode 100644
index a444d47bb..000000000
--- a/baseconfig/s390x/CONFIG_NUMA_EMU
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NUMA_EMU=y
diff --git a/baseconfig/s390x/CONFIG_N_GSM b/baseconfig/s390x/CONFIG_N_GSM
deleted file mode 100644
index e00ec7e28..000000000
--- a/baseconfig/s390x/CONFIG_N_GSM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_N_GSM is not set
diff --git a/baseconfig/s390x/CONFIG_OF b/baseconfig/s390x/CONFIG_OF
deleted file mode 100644
index d15176e9c..000000000
--- a/baseconfig/s390x/CONFIG_OF
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_OF is not set
diff --git a/baseconfig/s390x/CONFIG_OSF_PARTITION b/baseconfig/s390x/CONFIG_OSF_PARTITION
deleted file mode 100644
index 50b3cb64e..000000000
--- a/baseconfig/s390x/CONFIG_OSF_PARTITION
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_OSF_PARTITION is not set
diff --git a/baseconfig/s390x/CONFIG_PACK_STACK b/baseconfig/s390x/CONFIG_PACK_STACK
deleted file mode 100644
index 8182d4c4f..000000000
--- a/baseconfig/s390x/CONFIG_PACK_STACK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PACK_STACK=y
diff --git a/baseconfig/s390x/CONFIG_PARTITION_ADVANCED b/baseconfig/s390x/CONFIG_PARTITION_ADVANCED
deleted file mode 100644
index 313ee5586..000000000
--- a/baseconfig/s390x/CONFIG_PARTITION_ADVANCED
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PARTITION_ADVANCED=y
diff --git a/baseconfig/s390x/CONFIG_PCI b/baseconfig/s390x/CONFIG_PCI
deleted file mode 100644
index c499609c3..000000000
--- a/baseconfig/s390x/CONFIG_PCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCI=y
diff --git a/baseconfig/s390x/CONFIG_PCIPCWATCHDOG b/baseconfig/s390x/CONFIG_PCIPCWATCHDOG
deleted file mode 100644
index 717da169d..000000000
--- a/baseconfig/s390x/CONFIG_PCIPCWATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PCIPCWATCHDOG is not set
diff --git a/baseconfig/s390x/CONFIG_PCI_MSI_IRQ_DOMAIN b/baseconfig/s390x/CONFIG_PCI_MSI_IRQ_DOMAIN
deleted file mode 100644
index 2d1ad5bb1..000000000
--- a/baseconfig/s390x/CONFIG_PCI_MSI_IRQ_DOMAIN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PCI_MSI_IRQ_DOMAIN is not set
diff --git a/baseconfig/s390x/CONFIG_PCI_NR_FUNCTIONS b/baseconfig/s390x/CONFIG_PCI_NR_FUNCTIONS
deleted file mode 100644
index 5d60ce184..000000000
--- a/baseconfig/s390x/CONFIG_PCI_NR_FUNCTIONS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PCI_NR_FUNCTIONS=64
diff --git a/baseconfig/s390x/CONFIG_PCMCIA b/baseconfig/s390x/CONFIG_PCMCIA
deleted file mode 100644
index 3cf9bfbdc..000000000
--- a/baseconfig/s390x/CONFIG_PCMCIA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PCMCIA is not set
diff --git a/baseconfig/s390x/CONFIG_PFAULT b/baseconfig/s390x/CONFIG_PFAULT
deleted file mode 100644
index 3b8378a03..000000000
--- a/baseconfig/s390x/CONFIG_PFAULT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PFAULT=y
diff --git a/baseconfig/s390x/CONFIG_PHYLIB b/baseconfig/s390x/CONFIG_PHYLIB
deleted file mode 100644
index 9ecd6c079..000000000
--- a/baseconfig/s390x/CONFIG_PHYLIB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHYLIB=m
diff --git a/baseconfig/s390x/CONFIG_PKEY b/baseconfig/s390x/CONFIG_PKEY
deleted file mode 100644
index ec0fc60b1..000000000
--- a/baseconfig/s390x/CONFIG_PKEY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PKEY=m
diff --git a/baseconfig/s390x/CONFIG_PM_DEVFREQ b/baseconfig/s390x/CONFIG_PM_DEVFREQ
deleted file mode 100644
index ada3814f1..000000000
--- a/baseconfig/s390x/CONFIG_PM_DEVFREQ
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PM_DEVFREQ is not set
diff --git a/baseconfig/s390x/CONFIG_POWER_RESET b/baseconfig/s390x/CONFIG_POWER_RESET
deleted file mode 100644
index ecb8fc786..000000000
--- a/baseconfig/s390x/CONFIG_POWER_RESET
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_POWER_RESET is not set
diff --git a/baseconfig/s390x/CONFIG_PREEMPT_TRACER b/baseconfig/s390x/CONFIG_PREEMPT_TRACER
deleted file mode 100644
index 42ab34971..000000000
--- a/baseconfig/s390x/CONFIG_PREEMPT_TRACER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PREEMPT_TRACER is not set
diff --git a/baseconfig/s390x/CONFIG_PWM b/baseconfig/s390x/CONFIG_PWM
deleted file mode 100644
index 650ee865d..000000000
--- a/baseconfig/s390x/CONFIG_PWM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PWM is not set
diff --git a/baseconfig/s390x/CONFIG_QDIO b/baseconfig/s390x/CONFIG_QDIO
deleted file mode 100644
index c024224b5..000000000
--- a/baseconfig/s390x/CONFIG_QDIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QDIO=m
diff --git a/baseconfig/s390x/CONFIG_QETH b/baseconfig/s390x/CONFIG_QETH
deleted file mode 100644
index 8d10b2b02..000000000
--- a/baseconfig/s390x/CONFIG_QETH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QETH=m
diff --git a/baseconfig/s390x/CONFIG_QETH_IPV6 b/baseconfig/s390x/CONFIG_QETH_IPV6
deleted file mode 100644
index 167c02d00..000000000
--- a/baseconfig/s390x/CONFIG_QETH_IPV6
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QETH_IPV6=y
diff --git a/baseconfig/s390x/CONFIG_QETH_L2 b/baseconfig/s390x/CONFIG_QETH_L2
deleted file mode 100644
index fb872ff9a..000000000
--- a/baseconfig/s390x/CONFIG_QETH_L2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QETH_L2=m
diff --git a/baseconfig/s390x/CONFIG_QETH_L3 b/baseconfig/s390x/CONFIG_QETH_L3
deleted file mode 100644
index 248169a7b..000000000
--- a/baseconfig/s390x/CONFIG_QETH_L3
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_QETH_L3=m
diff --git a/baseconfig/s390x/CONFIG_R3964 b/baseconfig/s390x/CONFIG_R3964
deleted file mode 100644
index cca74303c..000000000
--- a/baseconfig/s390x/CONFIG_R3964
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_R3964 is not set
diff --git a/baseconfig/s390x/CONFIG_RCU_FANOUT b/baseconfig/s390x/CONFIG_RCU_FANOUT
deleted file mode 100644
index e95447c12..000000000
--- a/baseconfig/s390x/CONFIG_RCU_FANOUT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RCU_FANOUT=64
diff --git a/baseconfig/s390x/CONFIG_RCU_FANOUT_LEAF b/baseconfig/s390x/CONFIG_RCU_FANOUT_LEAF
deleted file mode 100644
index 147351a49..000000000
--- a/baseconfig/s390x/CONFIG_RCU_FANOUT_LEAF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RCU_FANOUT_LEAF=16
diff --git a/baseconfig/s390x/CONFIG_RESET_CONTROLLER b/baseconfig/s390x/CONFIG_RESET_CONTROLLER
deleted file mode 100644
index 0f97f3f23..000000000
--- a/baseconfig/s390x/CONFIG_RESET_CONTROLLER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_RESET_CONTROLLER is not set
diff --git a/baseconfig/s390x/CONFIG_RFKILL b/baseconfig/s390x/CONFIG_RFKILL
deleted file mode 100644
index f840ecd26..000000000
--- a/baseconfig/s390x/CONFIG_RFKILL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_RFKILL is not set
diff --git a/baseconfig/s390x/CONFIG_RMI4_CORE b/baseconfig/s390x/CONFIG_RMI4_CORE
deleted file mode 100644
index 94b27f88c..000000000
--- a/baseconfig/s390x/CONFIG_RMI4_CORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_RMI4_CORE is not set
diff --git a/baseconfig/s390x/CONFIG_S390_CCW_IOMMU b/baseconfig/s390x/CONFIG_S390_CCW_IOMMU
deleted file mode 100644
index 7dd58dfa7..000000000
--- a/baseconfig/s390x/CONFIG_S390_CCW_IOMMU
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_S390_CCW_IOMMU=y
diff --git a/baseconfig/s390x/CONFIG_S390_GUEST b/baseconfig/s390x/CONFIG_S390_GUEST
deleted file mode 100644
index 6c2fd6328..000000000
--- a/baseconfig/s390x/CONFIG_S390_GUEST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_S390_GUEST=y
diff --git a/baseconfig/s390x/CONFIG_S390_GUEST_OLD_TRANSPORT b/baseconfig/s390x/CONFIG_S390_GUEST_OLD_TRANSPORT
deleted file mode 100644
index e69010cb7..000000000
--- a/baseconfig/s390x/CONFIG_S390_GUEST_OLD_TRANSPORT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_S390_GUEST_OLD_TRANSPORT=y
diff --git a/baseconfig/s390x/CONFIG_S390_HYPFS_FS b/baseconfig/s390x/CONFIG_S390_HYPFS_FS
deleted file mode 100644
index 335ddc330..000000000
--- a/baseconfig/s390x/CONFIG_S390_HYPFS_FS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_S390_HYPFS_FS=y
diff --git a/baseconfig/s390x/CONFIG_S390_PRNG b/baseconfig/s390x/CONFIG_S390_PRNG
deleted file mode 100644
index 657a61496..000000000
--- a/baseconfig/s390x/CONFIG_S390_PRNG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_S390_PRNG=m
diff --git a/baseconfig/s390x/CONFIG_S390_PTDUMP b/baseconfig/s390x/CONFIG_S390_PTDUMP
deleted file mode 100644
index b268bbaed..000000000
--- a/baseconfig/s390x/CONFIG_S390_PTDUMP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_S390_PTDUMP is not set
diff --git a/baseconfig/s390x/CONFIG_S390_TAPE b/baseconfig/s390x/CONFIG_S390_TAPE
deleted file mode 100644
index eafaa7dc0..000000000
--- a/baseconfig/s390x/CONFIG_S390_TAPE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_S390_TAPE=m
diff --git a/baseconfig/s390x/CONFIG_S390_TAPE_34XX b/baseconfig/s390x/CONFIG_S390_TAPE_34XX
deleted file mode 100644
index 03374a3f0..000000000
--- a/baseconfig/s390x/CONFIG_S390_TAPE_34XX
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_S390_TAPE_34XX=m
diff --git a/baseconfig/s390x/CONFIG_S390_TAPE_3590 b/baseconfig/s390x/CONFIG_S390_TAPE_3590
deleted file mode 100644
index 275b3e5bc..000000000
--- a/baseconfig/s390x/CONFIG_S390_TAPE_3590
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_S390_TAPE_3590=m
diff --git a/baseconfig/s390x/CONFIG_S390_VMUR b/baseconfig/s390x/CONFIG_S390_VMUR
deleted file mode 100644
index 7672ac928..000000000
--- a/baseconfig/s390x/CONFIG_S390_VMUR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_S390_VMUR=m
diff --git a/baseconfig/s390x/CONFIG_SCHED_BOOK b/baseconfig/s390x/CONFIG_SCHED_BOOK
deleted file mode 100644
index ef8a1d29c..000000000
--- a/baseconfig/s390x/CONFIG_SCHED_BOOK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCHED_BOOK=y
diff --git a/baseconfig/s390x/CONFIG_SCHED_MC b/baseconfig/s390x/CONFIG_SCHED_MC
deleted file mode 100644
index 348674403..000000000
--- a/baseconfig/s390x/CONFIG_SCHED_MC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCHED_MC=y
diff --git a/baseconfig/s390x/CONFIG_SCHED_TOPOLOGY b/baseconfig/s390x/CONFIG_SCHED_TOPOLOGY
deleted file mode 100644
index f26c78761..000000000
--- a/baseconfig/s390x/CONFIG_SCHED_TOPOLOGY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCHED_TOPOLOGY=y
diff --git a/baseconfig/s390x/CONFIG_SCLP_ASYNC b/baseconfig/s390x/CONFIG_SCLP_ASYNC
deleted file mode 100644
index b4408b75a..000000000
--- a/baseconfig/s390x/CONFIG_SCLP_ASYNC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCLP_ASYNC=m
diff --git a/baseconfig/s390x/CONFIG_SCLP_ASYNC_ID b/baseconfig/s390x/CONFIG_SCLP_ASYNC_ID
deleted file mode 100644
index c99c14855..000000000
--- a/baseconfig/s390x/CONFIG_SCLP_ASYNC_ID
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCLP_ASYNC_ID="000000000"
diff --git a/baseconfig/s390x/CONFIG_SCLP_CONSOLE b/baseconfig/s390x/CONFIG_SCLP_CONSOLE
deleted file mode 100644
index f254d3f46..000000000
--- a/baseconfig/s390x/CONFIG_SCLP_CONSOLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCLP_CONSOLE=y
diff --git a/baseconfig/s390x/CONFIG_SCLP_OFB b/baseconfig/s390x/CONFIG_SCLP_OFB
deleted file mode 100644
index 62cca9859..000000000
--- a/baseconfig/s390x/CONFIG_SCLP_OFB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCLP_OFB=y
diff --git a/baseconfig/s390x/CONFIG_SCLP_TTY b/baseconfig/s390x/CONFIG_SCLP_TTY
deleted file mode 100644
index 6761090ee..000000000
--- a/baseconfig/s390x/CONFIG_SCLP_TTY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCLP_TTY=y
diff --git a/baseconfig/s390x/CONFIG_SCLP_VT220_CONSOLE b/baseconfig/s390x/CONFIG_SCLP_VT220_CONSOLE
deleted file mode 100644
index 881f42dc0..000000000
--- a/baseconfig/s390x/CONFIG_SCLP_VT220_CONSOLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCLP_VT220_CONSOLE=y
diff --git a/baseconfig/s390x/CONFIG_SCLP_VT220_TTY b/baseconfig/s390x/CONFIG_SCLP_VT220_TTY
deleted file mode 100644
index 788261706..000000000
--- a/baseconfig/s390x/CONFIG_SCLP_VT220_TTY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCLP_VT220_TTY=y
diff --git a/baseconfig/s390x/CONFIG_SCM_BLOCK b/baseconfig/s390x/CONFIG_SCM_BLOCK
deleted file mode 100644
index bcad0f536..000000000
--- a/baseconfig/s390x/CONFIG_SCM_BLOCK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCM_BLOCK=m
diff --git a/baseconfig/s390x/CONFIG_SCM_BLOCK_CLUSTER_WRITE b/baseconfig/s390x/CONFIG_SCM_BLOCK_CLUSTER_WRITE
deleted file mode 100644
index 1461f92ad..000000000
--- a/baseconfig/s390x/CONFIG_SCM_BLOCK_CLUSTER_WRITE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
diff --git a/baseconfig/s390x/CONFIG_SCM_BUS b/baseconfig/s390x/CONFIG_SCM_BUS
deleted file mode 100644
index 5e2adaef4..000000000
--- a/baseconfig/s390x/CONFIG_SCM_BUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCM_BUS=y
diff --git a/baseconfig/s390x/CONFIG_SCSI_3W_9XXX b/baseconfig/s390x/CONFIG_SCSI_3W_9XXX
deleted file mode 100644
index 00de6f158..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_3W_9XXX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_3W_9XXX is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_3W_SAS b/baseconfig/s390x/CONFIG_SCSI_3W_SAS
deleted file mode 100644
index 06a89f918..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_3W_SAS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_3W_SAS is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_AACRAID b/baseconfig/s390x/CONFIG_SCSI_AACRAID
deleted file mode 100644
index 5686e689d..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_AACRAID
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_AACRAID is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_ACARD b/baseconfig/s390x/CONFIG_SCSI_ACARD
deleted file mode 100644
index d4002ddd0..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_ACARD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_ACARD is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_AIC79XX b/baseconfig/s390x/CONFIG_SCSI_AIC79XX
deleted file mode 100644
index 801fade38..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_AIC79XX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_AIC79XX is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_AIC7XXX b/baseconfig/s390x/CONFIG_SCSI_AIC7XXX
deleted file mode 100644
index f305031d0..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_AIC7XXX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_AIC7XXX is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_AM53C974 b/baseconfig/s390x/CONFIG_SCSI_AM53C974
deleted file mode 100644
index ce64864a7..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_AM53C974
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_AM53C974 is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_ARCMSR b/baseconfig/s390x/CONFIG_SCSI_ARCMSR
deleted file mode 100644
index 425f89f74..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_ARCMSR
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_ARCMSR is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_BFA_FC b/baseconfig/s390x/CONFIG_SCSI_BFA_FC
deleted file mode 100644
index 8568e1ec8..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_BFA_FC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_BFA_FC is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_BNX2X_FCOE b/baseconfig/s390x/CONFIG_SCSI_BNX2X_FCOE
deleted file mode 100644
index 5d36d085f..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_BNX2X_FCOE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_BNX2X_FCOE is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_BNX2_ISCSI b/baseconfig/s390x/CONFIG_SCSI_BNX2_ISCSI
deleted file mode 100644
index d400977df..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_BNX2_ISCSI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_BNX2_ISCSI is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_CHELSIO_FCOE b/baseconfig/s390x/CONFIG_SCSI_CHELSIO_FCOE
deleted file mode 100644
index ad8110de9..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_CHELSIO_FCOE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_CHELSIO_FCOE is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_CXGB3_ISCSI b/baseconfig/s390x/CONFIG_SCSI_CXGB3_ISCSI
deleted file mode 100644
index d1e803258..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_CXGB3_ISCSI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_CXGB3_ISCSI is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_CXGB4_ISCSI b/baseconfig/s390x/CONFIG_SCSI_CXGB4_ISCSI
deleted file mode 100644
index 27a4bb985..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_CXGB4_ISCSI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_CXGB4_ISCSI is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_DC395x b/baseconfig/s390x/CONFIG_SCSI_DC395x
deleted file mode 100644
index 04438189f..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_DC395x
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_DC395x is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_DH b/baseconfig/s390x/CONFIG_SCSI_DH
deleted file mode 100644
index e5b8a74ea..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_DH
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_DH is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_DMX3191D b/baseconfig/s390x/CONFIG_SCSI_DMX3191D
deleted file mode 100644
index 291b9196e..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_DMX3191D
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_DMX3191D is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_ESAS2R b/baseconfig/s390x/CONFIG_SCSI_ESAS2R
deleted file mode 100644
index 190cb39db..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_ESAS2R
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_ESAS2R is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_HPSA b/baseconfig/s390x/CONFIG_SCSI_HPSA
deleted file mode 100644
index e2d1a299c..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_HPSA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_HPSA is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_HPTIOP b/baseconfig/s390x/CONFIG_SCSI_HPTIOP
deleted file mode 100644
index e92d4a91f..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_HPTIOP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_HPTIOP is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_INIA100 b/baseconfig/s390x/CONFIG_SCSI_INIA100
deleted file mode 100644
index 50f5dd42b..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_INIA100
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_INIA100 is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_INITIO b/baseconfig/s390x/CONFIG_SCSI_INITIO
deleted file mode 100644
index 7abe6c2d9..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_INITIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_INITIO is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_IPS b/baseconfig/s390x/CONFIG_SCSI_IPS
deleted file mode 100644
index 32e4abe67..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_IPS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_IPS is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_LPFC b/baseconfig/s390x/CONFIG_SCSI_LPFC
deleted file mode 100644
index 2bbb943d3..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_LPFC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_LPFC is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_MPT2SAS b/baseconfig/s390x/CONFIG_SCSI_MPT2SAS
deleted file mode 100644
index aca3c70c3..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_MPT2SAS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_MPT2SAS is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_MPT3SAS b/baseconfig/s390x/CONFIG_SCSI_MPT3SAS
deleted file mode 100644
index 887255096..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_MPT3SAS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_MPT3SAS is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_MVSAS b/baseconfig/s390x/CONFIG_SCSI_MVSAS
deleted file mode 100644
index dd17532f6..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_MVSAS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_MVSAS is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_MVUMI b/baseconfig/s390x/CONFIG_SCSI_MVUMI
deleted file mode 100644
index a9b158a85..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_MVUMI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_MVUMI is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_PM8001 b/baseconfig/s390x/CONFIG_SCSI_PM8001
deleted file mode 100644
index ddafafd46..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_PM8001
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_PM8001 is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_PMCRAID b/baseconfig/s390x/CONFIG_SCSI_PMCRAID
deleted file mode 100644
index 91c798c43..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_PMCRAID
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_PMCRAID is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_QLA_FC b/baseconfig/s390x/CONFIG_SCSI_QLA_FC
deleted file mode 100644
index f8042094e..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_QLA_FC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_QLA_FC is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_QLA_ISCSI b/baseconfig/s390x/CONFIG_SCSI_QLA_ISCSI
deleted file mode 100644
index 14ad3035a..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_QLA_ISCSI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_QLA_ISCSI is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_QLOGIC_1280 b/baseconfig/s390x/CONFIG_SCSI_QLOGIC_1280
deleted file mode 100644
index 98bf0179a..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_QLOGIC_1280
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_QLOGIC_1280 is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_SNIC b/baseconfig/s390x/CONFIG_SCSI_SNIC
deleted file mode 100644
index 5fa55adc9..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_SNIC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_SNIC is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_STEX b/baseconfig/s390x/CONFIG_SCSI_STEX
deleted file mode 100644
index 51be1d1eb..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_STEX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_STEX is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_SYM53C8XX_2 b/baseconfig/s390x/CONFIG_SCSI_SYM53C8XX_2
deleted file mode 100644
index 1cb592105..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_SYM53C8XX_2
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_SYM53C8XX_2 is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_UFSHCD b/baseconfig/s390x/CONFIG_SCSI_UFSHCD
deleted file mode 100644
index 542c89fc7..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_UFSHCD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_UFSHCD is not set
diff --git a/baseconfig/s390x/CONFIG_SCSI_WD719X b/baseconfig/s390x/CONFIG_SCSI_WD719X
deleted file mode 100644
index 96273e303..000000000
--- a/baseconfig/s390x/CONFIG_SCSI_WD719X
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_WD719X is not set
diff --git a/baseconfig/s390x/CONFIG_SENSORS_APDS990X b/baseconfig/s390x/CONFIG_SENSORS_APDS990X
deleted file mode 100644
index 3aa738be2..000000000
--- a/baseconfig/s390x/CONFIG_SENSORS_APDS990X
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SENSORS_APDS990X is not set
diff --git a/baseconfig/s390x/CONFIG_SENSORS_BH1770 b/baseconfig/s390x/CONFIG_SENSORS_BH1770
deleted file mode 100644
index f6d8bfafa..000000000
--- a/baseconfig/s390x/CONFIG_SENSORS_BH1770
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SENSORS_BH1770 is not set
diff --git a/baseconfig/s390x/CONFIG_SENSORS_LIS3LV02D b/baseconfig/s390x/CONFIG_SENSORS_LIS3LV02D
deleted file mode 100644
index 37a6cf6ac..000000000
--- a/baseconfig/s390x/CONFIG_SENSORS_LIS3LV02D
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SENSORS_LIS3LV02D is not set
diff --git a/baseconfig/s390x/CONFIG_SENSORS_LIS3_I2C b/baseconfig/s390x/CONFIG_SENSORS_LIS3_I2C
deleted file mode 100644
index 3086c9ed5..000000000
--- a/baseconfig/s390x/CONFIG_SENSORS_LIS3_I2C
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SENSORS_LIS3_I2C is not set
diff --git a/baseconfig/s390x/CONFIG_SENSORS_TSL2550 b/baseconfig/s390x/CONFIG_SENSORS_TSL2550
deleted file mode 100644
index c2702cc2c..000000000
--- a/baseconfig/s390x/CONFIG_SENSORS_TSL2550
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SENSORS_TSL2550 is not set
diff --git a/baseconfig/s390x/CONFIG_SERIAL_8250 b/baseconfig/s390x/CONFIG_SERIAL_8250
deleted file mode 100644
index 4dd74a78b..000000000
--- a/baseconfig/s390x/CONFIG_SERIAL_8250
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SERIAL_8250 is not set
diff --git a/baseconfig/s390x/CONFIG_SERIAL_CORE b/baseconfig/s390x/CONFIG_SERIAL_CORE
deleted file mode 100644
index 32ecde504..000000000
--- a/baseconfig/s390x/CONFIG_SERIAL_CORE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIAL_CORE=m
diff --git a/baseconfig/s390x/CONFIG_SERIAL_NONSTANDARD b/baseconfig/s390x/CONFIG_SERIAL_NONSTANDARD
deleted file mode 100644
index 57688cbec..000000000
--- a/baseconfig/s390x/CONFIG_SERIAL_NONSTANDARD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SERIAL_NONSTANDARD is not set
diff --git a/baseconfig/s390x/CONFIG_SERIO b/baseconfig/s390x/CONFIG_SERIO
deleted file mode 100644
index a0fb6e359..000000000
--- a/baseconfig/s390x/CONFIG_SERIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SERIO is not set
diff --git a/baseconfig/s390x/CONFIG_SERIO_LIBPS2 b/baseconfig/s390x/CONFIG_SERIO_LIBPS2
deleted file mode 100644
index b4e848291..000000000
--- a/baseconfig/s390x/CONFIG_SERIO_LIBPS2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIO_LIBPS2=m
diff --git a/baseconfig/s390x/CONFIG_SERIO_SERPORT b/baseconfig/s390x/CONFIG_SERIO_SERPORT
deleted file mode 100644
index 80a07531f..000000000
--- a/baseconfig/s390x/CONFIG_SERIO_SERPORT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SERIO_SERPORT=m
diff --git a/baseconfig/s390x/CONFIG_SFC b/baseconfig/s390x/CONFIG_SFC
deleted file mode 100644
index fdc60b90f..000000000
--- a/baseconfig/s390x/CONFIG_SFC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SFC is not set
diff --git a/baseconfig/s390x/CONFIG_SGI_PARTITION b/baseconfig/s390x/CONFIG_SGI_PARTITION
deleted file mode 100644
index 49a58fc9b..000000000
--- a/baseconfig/s390x/CONFIG_SGI_PARTITION
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SGI_PARTITION is not set
diff --git a/baseconfig/s390x/CONFIG_SHARED_KERNEL b/baseconfig/s390x/CONFIG_SHARED_KERNEL
deleted file mode 100644
index 93d100cb3..000000000
--- a/baseconfig/s390x/CONFIG_SHARED_KERNEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SHARED_KERNEL=y
diff --git a/baseconfig/s390x/CONFIG_SH_ETH b/baseconfig/s390x/CONFIG_SH_ETH
deleted file mode 100644
index 9c77b55e3..000000000
--- a/baseconfig/s390x/CONFIG_SH_ETH
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SH_ETH is not set
diff --git a/baseconfig/s390x/CONFIG_SLIP b/baseconfig/s390x/CONFIG_SLIP
deleted file mode 100644
index 953347ac5..000000000
--- a/baseconfig/s390x/CONFIG_SLIP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SLIP is not set
diff --git a/baseconfig/s390x/CONFIG_SMSGIUCV b/baseconfig/s390x/CONFIG_SMSGIUCV
deleted file mode 100644
index 0375207cd..000000000
--- a/baseconfig/s390x/CONFIG_SMSGIUCV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SMSGIUCV=m
diff --git a/baseconfig/s390x/CONFIG_SMSGIUCV_EVENT b/baseconfig/s390x/CONFIG_SMSGIUCV_EVENT
deleted file mode 100644
index d29cad660..000000000
--- a/baseconfig/s390x/CONFIG_SMSGIUCV_EVENT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SMSGIUCV_EVENT=m
diff --git a/baseconfig/s390x/CONFIG_SOUND b/baseconfig/s390x/CONFIG_SOUND
deleted file mode 100644
index c4f3666c2..000000000
--- a/baseconfig/s390x/CONFIG_SOUND
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SOUND is not set
diff --git a/baseconfig/s390x/CONFIG_SSB b/baseconfig/s390x/CONFIG_SSB
deleted file mode 100644
index 7b1e39107..000000000
--- a/baseconfig/s390x/CONFIG_SSB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SSB is not set
diff --git a/baseconfig/s390x/CONFIG_STACK_GUARD b/baseconfig/s390x/CONFIG_STACK_GUARD
deleted file mode 100644
index f1b5117e8..000000000
--- a/baseconfig/s390x/CONFIG_STACK_GUARD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_STACK_GUARD=256
diff --git a/baseconfig/s390x/CONFIG_STAGING b/baseconfig/s390x/CONFIG_STAGING
deleted file mode 100644
index 9f033d229..000000000
--- a/baseconfig/s390x/CONFIG_STAGING
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_STAGING is not set
diff --git a/baseconfig/s390x/CONFIG_SUN_PARTITION b/baseconfig/s390x/CONFIG_SUN_PARTITION
deleted file mode 100644
index ba5270328..000000000
--- a/baseconfig/s390x/CONFIG_SUN_PARTITION
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUN_PARTITION is not set
diff --git a/baseconfig/s390x/CONFIG_SUSPEND b/baseconfig/s390x/CONFIG_SUSPEND
deleted file mode 100644
index b7b33c1e5..000000000
--- a/baseconfig/s390x/CONFIG_SUSPEND
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUSPEND is not set
diff --git a/baseconfig/s390x/CONFIG_THERMAL b/baseconfig/s390x/CONFIG_THERMAL
deleted file mode 100644
index 2fbe48c5d..000000000
--- a/baseconfig/s390x/CONFIG_THERMAL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_THERMAL is not set
diff --git a/baseconfig/s390x/CONFIG_TIFM_CORE b/baseconfig/s390x/CONFIG_TIFM_CORE
deleted file mode 100644
index 69a12a978..000000000
--- a/baseconfig/s390x/CONFIG_TIFM_CORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TIFM_CORE is not set
diff --git a/baseconfig/s390x/CONFIG_TN3215 b/baseconfig/s390x/CONFIG_TN3215
deleted file mode 100644
index 93adc9abe..000000000
--- a/baseconfig/s390x/CONFIG_TN3215
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TN3215=y
diff --git a/baseconfig/s390x/CONFIG_TN3215_CONSOLE b/baseconfig/s390x/CONFIG_TN3215_CONSOLE
deleted file mode 100644
index 2371f9b22..000000000
--- a/baseconfig/s390x/CONFIG_TN3215_CONSOLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TN3215_CONSOLE=y
diff --git a/baseconfig/s390x/CONFIG_TN3270 b/baseconfig/s390x/CONFIG_TN3270
deleted file mode 100644
index 05b757507..000000000
--- a/baseconfig/s390x/CONFIG_TN3270
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TN3270=y
diff --git a/baseconfig/s390x/CONFIG_TN3270_CONSOLE b/baseconfig/s390x/CONFIG_TN3270_CONSOLE
deleted file mode 100644
index d85def357..000000000
--- a/baseconfig/s390x/CONFIG_TN3270_CONSOLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TN3270_CONSOLE=y
diff --git a/baseconfig/s390x/CONFIG_TN3270_FS b/baseconfig/s390x/CONFIG_TN3270_FS
deleted file mode 100644
index 2750f71e6..000000000
--- a/baseconfig/s390x/CONFIG_TN3270_FS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TN3270_FS=m
diff --git a/baseconfig/s390x/CONFIG_TN3270_TTY b/baseconfig/s390x/CONFIG_TN3270_TTY
deleted file mode 100644
index ce688a480..000000000
--- a/baseconfig/s390x/CONFIG_TN3270_TTY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TN3270_TTY=y
diff --git a/baseconfig/s390x/CONFIG_TR b/baseconfig/s390x/CONFIG_TR
deleted file mode 100644
index f354bfa01..000000000
--- a/baseconfig/s390x/CONFIG_TR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TR=y
diff --git a/baseconfig/s390x/CONFIG_TRANSPARENT_HUGEPAGE b/baseconfig/s390x/CONFIG_TRANSPARENT_HUGEPAGE
deleted file mode 100644
index 4874a851b..000000000
--- a/baseconfig/s390x/CONFIG_TRANSPARENT_HUGEPAGE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
diff --git a/baseconfig/s390x/CONFIG_UIO b/baseconfig/s390x/CONFIG_UIO
deleted file mode 100644
index 566183b75..000000000
--- a/baseconfig/s390x/CONFIG_UIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_UIO is not set
diff --git a/baseconfig/s390x/CONFIG_USB_SUPPORT b/baseconfig/s390x/CONFIG_USB_SUPPORT
deleted file mode 100644
index c56052a7a..000000000
--- a/baseconfig/s390x/CONFIG_USB_SUPPORT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_USB_SUPPORT is not set
diff --git a/baseconfig/s390x/CONFIG_UWB b/baseconfig/s390x/CONFIG_UWB
deleted file mode 100644
index 3ef31c4bc..000000000
--- a/baseconfig/s390x/CONFIG_UWB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_UWB is not set
diff --git a/baseconfig/s390x/CONFIG_VFIO_CCW b/baseconfig/s390x/CONFIG_VFIO_CCW
deleted file mode 100644
index 15f7493a4..000000000
--- a/baseconfig/s390x/CONFIG_VFIO_CCW
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VFIO_CCW=m
diff --git a/baseconfig/s390x/CONFIG_VIRTIO_CONSOLE b/baseconfig/s390x/CONFIG_VIRTIO_CONSOLE
deleted file mode 100644
index 390e7e6d8..000000000
--- a/baseconfig/s390x/CONFIG_VIRTIO_CONSOLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIRTIO_CONSOLE=y
diff --git a/baseconfig/s390x/CONFIG_VMCP b/baseconfig/s390x/CONFIG_VMCP
deleted file mode 100644
index 1b28cf4a6..000000000
--- a/baseconfig/s390x/CONFIG_VMCP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VMCP=y
diff --git a/baseconfig/s390x/CONFIG_VMCP_CMA_SIZE b/baseconfig/s390x/CONFIG_VMCP_CMA_SIZE
deleted file mode 100644
index aee0667ac..000000000
--- a/baseconfig/s390x/CONFIG_VMCP_CMA_SIZE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VMCP_CMA_SIZE=4
diff --git a/baseconfig/s390x/CONFIG_VMLOGRDR b/baseconfig/s390x/CONFIG_VMLOGRDR
deleted file mode 100644
index 2257784e9..000000000
--- a/baseconfig/s390x/CONFIG_VMLOGRDR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VMLOGRDR=m
diff --git a/baseconfig/s390x/CONFIG_W1 b/baseconfig/s390x/CONFIG_W1
deleted file mode 100644
index c224e25f0..000000000
--- a/baseconfig/s390x/CONFIG_W1
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_W1 is not set
diff --git a/baseconfig/s390x/CONFIG_WAN b/baseconfig/s390x/CONFIG_WAN
deleted file mode 100644
index d4ab57e1a..000000000
--- a/baseconfig/s390x/CONFIG_WAN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_WAN is not set
diff --git a/baseconfig/s390x/CONFIG_WARN_DYNAMIC_STACK b/baseconfig/s390x/CONFIG_WARN_DYNAMIC_STACK
deleted file mode 100644
index 641f31747..000000000
--- a/baseconfig/s390x/CONFIG_WARN_DYNAMIC_STACK
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_WARN_DYNAMIC_STACK is not set
diff --git a/baseconfig/s390x/CONFIG_WDTPCI b/baseconfig/s390x/CONFIG_WDTPCI
deleted file mode 100644
index ca556694d..000000000
--- a/baseconfig/s390x/CONFIG_WDTPCI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_WDTPCI is not set
diff --git a/baseconfig/s390x/CONFIG_WIRELESS_EXT b/baseconfig/s390x/CONFIG_WIRELESS_EXT
deleted file mode 100644
index 2e1670401..000000000
--- a/baseconfig/s390x/CONFIG_WIRELESS_EXT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_WIRELESS_EXT is not set
diff --git a/baseconfig/s390x/CONFIG_XILLYBUS b/baseconfig/s390x/CONFIG_XILLYBUS
deleted file mode 100644
index ce2448ee6..000000000
--- a/baseconfig/s390x/CONFIG_XILLYBUS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_XILLYBUS is not set
diff --git a/baseconfig/s390x/CONFIG_ZCRYPT b/baseconfig/s390x/CONFIG_ZCRYPT
deleted file mode 100644
index 854d9232d..000000000
--- a/baseconfig/s390x/CONFIG_ZCRYPT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ZCRYPT=m
diff --git a/baseconfig/s390x/CONFIG_ZFCP b/baseconfig/s390x/CONFIG_ZFCP
deleted file mode 100644
index 332f53868..000000000
--- a/baseconfig/s390x/CONFIG_ZFCP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ZFCP=m