diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-04-28 08:45:44 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-04-28 08:45:44 -0400 |
commit | 51c0771553195afdcd515b83b6bc4c331846c549 (patch) | |
tree | ebf55db975ccb4b9ae7255e24e0d5158e10c15e0 | |
parent | 09bbb44fb1d7a22e5c88703a942328db9fac1488 (diff) | |
download | kernel-51c0771553195afdcd515b83b6bc4c331846c549.tar.gz kernel-51c0771553195afdcd515b83b6bc4c331846c549.tar.xz kernel-51c0771553195afdcd515b83b6bc4c331846c549.zip |
Prune stale config options
Some of these were removed upstream and others were dropped when
kernel-arm64.patch was killed off. Found by Paul's check-configs.pl
script.
-rw-r--r-- | config-arm-generic | 2 | ||||
-rw-r--r-- | config-arm64 | 4 | ||||
-rw-r--r-- | config-armv7 | 1 | ||||
-rw-r--r-- | config-armv7-lpae | 1 | ||||
-rw-r--r-- | config-generic | 8 | ||||
-rw-r--r-- | config-powerpc64 | 2 | ||||
-rw-r--r-- | config-powerpc64p7 | 2 | ||||
-rw-r--r-- | config-s390x | 3 | ||||
-rw-r--r-- | config-x86-generic | 1 |
9 files changed, 0 insertions, 24 deletions
diff --git a/config-arm-generic b/config-arm-generic index 11c934a5b..a6b5a8e8a 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -52,7 +52,6 @@ CONFIG_ARM_GIC=y CONFIG_ARM_GIC_V2M=y CONFIG_ARM_GIC_V3=y CONFIG_ARM_GIC_V3_ITS=y -CONFIG_KVM_ARM_VGIC=y CONFIG_ARM_GLOBAL_TIMER=y CONFIG_ARM_SMMU=y CONFIG_MMC_ARMMMCI=y @@ -157,7 +156,6 @@ CONFIG_USB_DWC3=m CONFIG_USB_DWC3_DUAL_ROLE=y CONFIG_USB_DWC3_PCI=m # CONFIG_USB_DWC3_DEBUG is not set -# CONFIG_DWC3_HOST_USB3_LPM_ENABLE is not set CONFIG_DW_WATCHDOG=m CONFIG_PCIE_DW=y # CONFIG_MMC_DW_EXYNOS is not set diff --git a/config-arm64 b/config-arm64 index 14b93d7c0..652262ab1 100644 --- a/config-arm64 +++ b/config-arm64 @@ -41,7 +41,6 @@ CONFIG_CMDLINE="console=ttyAMA0" CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CSUM=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_IO=y @@ -128,7 +127,6 @@ CONFIG_HOTPLUG_PCI=y # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set # CONFIG_PNP_DEBUG_MESSAGES is not set -CONFIG_SBSAUART_TTY=y CONFIG_I2C_SCMI=m CONFIG_SENSORS_ACPI_POWER=m @@ -168,6 +166,4 @@ CONFIG_SATA_AHCI_PLATFORM=y CONFIG_DEBUG_SECTION_MISMATCH=y -CONFIG_EDAC_XGENE=y - # CONFIG_FSL_MC_BUS is not set diff --git a/config-armv7 b/config-armv7 index 60b81fcb8..32fc8973e 100644 --- a/config-armv7 +++ b/config-armv7 @@ -267,7 +267,6 @@ CONFIG_ARCH_MSM8960=y CONFIG_ARCH_MSM8974=y CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y -CONFIG_SERIAL_MSM_HS=m CONFIG_PINCTRL_APQ8064=m CONFIG_PINCTRL_APQ8084=m CONFIG_PINCTRL_IPQ8064=m diff --git a/config-armv7-lpae b/config-armv7-lpae index 7600dd40e..154781632 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -28,7 +28,6 @@ CONFIG_ARM_ERRATA_773022=y CONFIG_KVM=y CONFIG_KVM_ARM_HOST=y CONFIG_KVM_ARM_MAX_VCPUS=8 -CONFIG_KVM_ARM_TIMER=y # CONFIG_XEN is not set CONFIG_XEN_FBDEV_FRONTEND=y diff --git a/config-generic b/config-generic index 28b1f7e5c..ee53f1fdf 100644 --- a/config-generic +++ b/config-generic @@ -1368,7 +1368,6 @@ CONFIG_ATL1=m CONFIG_ATL1C=m CONFIG_ATL1E=m CONFIG_NET_CADENCE=y -CONFIG_ARM_AT91_ETHER=m CONFIG_MACB=m CONFIG_NET_VENDOR_BROCADE=y @@ -2394,7 +2393,6 @@ CONFIG_TCG_TIS=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m # CONFIG_TCG_INFINEON is not set -# CONFIG_TCG_TIS_I2C_ST33 is not set # CONFIG_TCG_TIS_ST33ZP24 is not set # CONFIG_TCG_XEN is not set CONFIG_TELCLOCK=m @@ -2423,7 +2421,6 @@ CONFIG_CYCLADES=m CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_SC16IS7XX is not set -# CONFIG_SERIAL_MFD_HSU is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set @@ -3788,7 +3785,6 @@ CONFIG_HID_KEYTOUCH=m CONFIG_HID_LCPOWER=m CONFIG_HID_HOLTEK=m CONFIG_HOLTEK_FF=y -CONFIG_HID_HUION=m CONFIG_HID_GT683R=m CONFIG_HID_SPEEDLINK=m CONFIG_HID_WIIMOTE=m @@ -5507,11 +5503,7 @@ CONFIG_POWERCAP=y # CONFIG_GLOB_SELFTEST is not set -# CONFIG_SBSAUART_TTY is not set - # CONFIG_SERIAL_8250_FINTEK is not set # set in x86-generic presently # CONFIG_TOUCHSCREEN_GOODIX is not set - -CONFIG_PCI_ECAM=y diff --git a/config-powerpc64 b/config-powerpc64 index 683830cb4..0b1045e9e 100644 --- a/config-powerpc64 +++ b/config-powerpc64 @@ -11,7 +11,6 @@ CONFIG_PPC_MAPLE=y CONFIG_PPC_PSERIES=y CONFIG_PPC_PMAC=y CONFIG_PPC_POWERNV=y -CONFIG_PPC_POWERNV_RTAS=y CONFIG_SENSORS_IBMPOWERNV=y CONFIG_HW_RANDOM_POWERNV=m CONFIG_POWERNV_CPUFREQ=m @@ -20,7 +19,6 @@ CONFIG_SCOM_DEBUGFS=y # CONFIG_PPC_PASEMI is not set # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set # CONFIG_PPC_PS3 is not set -# CONFIG_PPC_CELLEB is not set # CONFIG_PPC_CELL_QPACE is not set CONFIG_PMAC_RACKMETER=m CONFIG_IBMEBUS=y diff --git a/config-powerpc64p7 b/config-powerpc64p7 index c942bcdbe..48d607db1 100644 --- a/config-powerpc64p7 +++ b/config-powerpc64p7 @@ -6,7 +6,6 @@ CONFIG_POWER7_CPU=y CONFIG_PPC_PSERIES=y # CONFIG_PPC_PMAC is not set CONFIG_PPC_POWERNV=y -CONFIG_PPC_POWERNV_RTAS=y CONFIG_HW_RANDOM_POWERNV=m CONFIG_SENSORS_IBMPOWERNV=y CONFIG_POWERNV_CPUFREQ=m @@ -15,7 +14,6 @@ CONFIG_SCOM_DEBUGFS=y # CONFIG_PPC_PASEMI is not set # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set # CONFIG_PPC_PS3 is not set -# CONFIG_PPC_CELLEB is not set # CONFIG_PPC_CELL_QPACE is not set CONFIG_IBMEBUS=y CONFIG_RTAS_FLASH=y diff --git a/config-s390x b/config-s390x index 829412f39..7d1ba22ce 100644 --- a/config-s390x +++ b/config-s390x @@ -1,5 +1,4 @@ CONFIG_64BIT=y -# CONFIG_MARCH_G5 is not set # CONFIG_MARCH_Z900 is not set CONFIG_MARCH_Z9_109=y # CONFIG_MARCH_Z990 is not set @@ -149,8 +148,6 @@ CONFIG_MONREADER=m CONFIG_VIRT_CPU_ACCOUNTING=y -# CONFIG_CLAW is not set - # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_MII is not set diff --git a/config-x86-generic b/config-x86-generic index bb5430422..c4c1d1367 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -428,7 +428,6 @@ CONFIG_INTEL_IDLE=y CONFIG_F71808E_WDT=m CONFIG_HPWDT_NMI_DECODING=y # CONFIG_MFD_TPS6586X is not set -# CONFIG_INTEL_MID_DMAC is not set # CONFIG_GPIO_INTEL_MID is not set CONFIG_PCH_DMA=m CONFIG_INTEL_IPS=m |