Clean up config

Use kconfigeditor2/process.py to put all definitions in Kconfig order
with proper headings.

Delete all definitions of unknown config symbols, which I verified
have been removed (or made automatic) upstream and not renamed.

svn path=/dists/sid/linux/; revision=22701
This commit is contained in:
Ben Hutchings 2015-05-25 02:22:25 +00:00
parent 5fe888b7ec
commit 9ce5cce4ba
15 changed files with 32 additions and 107 deletions

View File

@ -87,9 +87,9 @@ CONFIG_PHY_XGENE=m
##
## file: drivers/power/reset/Kconfig
##
CONFIG_POWER_RESET_SYSCON=y
CONFIG_POWER_RESET_VEXPRESS=y
CONFIG_POWER_RESET_XGENE=y
CONFIG_POWER_RESET_SYSCON=y
##
## file: drivers/rtc/Kconfig
@ -122,13 +122,13 @@ CONFIG_SERIAL_8250_DW=y
##
## file: drivers/usb/host/Kconfig
##
#. xhci-platform apparently does not build as module, so xhci_hcd can't be either
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_PLATFORM=y
CONFIG_USB_EHCI_HCD=m
CONFIG_USB_EHCI_HCD_PLATFORM=m
CONFIG_USB_OHCI_HCD=m
CONFIG_USB_OHCI_HCD_PLATFORM=m
#. xhci-platform apparently does not build as module, so xhci_hcd can't be either
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_PLATFORM=y
##
## file: drivers/virtio/Kconfig

View File

@ -88,14 +88,12 @@ CONFIG_ARCH_TEGRA=y
# CONFIG_ARCH_TEGRA_3x_SOC is not set
# CONFIG_ARCH_TEGRA_114_SOC is not set
CONFIG_ARCH_TEGRA_124_SOC=y
CONFIG_TEGRA_AHB=y
##
## file: arch/arm/mach-vexpress/Kconfig
##
CONFIG_ARCH_VEXPRESS=y
CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
CONFIG_ARCH_VEXPRESS_CA9X4=y
##
## file: arch/arm/mach-vt8500/Kconfig
@ -123,6 +121,11 @@ CONFIG_OMAP_SERIAL_WAKE=y
CONFIG_OMAP_PM_NOOP=y
## end choice
##
## file: drivers/amba/Kconfig
##
CONFIG_TEGRA_AHB=y
##
## file: drivers/ata/Kconfig
##
@ -220,6 +223,14 @@ CONFIG_DRM=m
##
CONFIG_DRM_I2C_NXP_TDA998X=m
##
## file: drivers/gpu/drm/imx/Kconfig
##
CONFIG_DRM_IMX=m
CONFIG_DRM_IMX_FB_HELPER=m
CONFIG_DRM_IMX_LDB=m
CONFIG_DRM_IMX_HDMI=m
##
## file: drivers/gpu/drm/omapdrm/Kconfig
##
@ -711,6 +722,7 @@ CONFIG_REGULATOR_VEXPRESS=m
CONFIG_RTC_DRV_AS3722=y
CONFIG_RTC_DRV_ISL12057=y
CONFIG_RTC_DRV_PALMAS=y
CONFIG_RTC_DRV_PCF8523=y
CONFIG_RTC_DRV_TWL4030=y
CONFIG_RTC_DRV_S5M=y
CONFIG_RTC_DRV_DA9052=y
@ -725,7 +737,6 @@ CONFIG_RTC_DRV_MC13XXX=y
CONFIG_RTC_DRV_TEGRA=y
CONFIG_RTC_DRV_MXC=y
CONFIG_RTC_DRV_SNVS=y
CONFIG_RTC_DRV_PCF8523=y
##
## file: drivers/scsi/Kconfig
@ -751,15 +762,6 @@ CONFIG_SPI_SPIDEV=y
##
CONFIG_LIS3L02DQ=m
##
## file: drivers/staging/imx-drm/Kconfig
##
CONFIG_DRM_IMX=m
CONFIG_DRM_IMX_FB_HELPER=m
CONFIG_DRM_IMX_LDB=m
CONFIG_DRM_IMX_IPUV3=m
CONFIG_DRM_IMX_HDMI=m
##
## file: drivers/thermal/Kconfig
##
@ -944,7 +946,6 @@ CONFIG_TEGRA_WATCHDOG=m
## file: kernel/power/Kconfig
##
CONFIG_SUSPEND=y
CONFIG_PM_RUNTIME=y
CONFIG_APM_EMULATION=y
##
@ -984,7 +985,6 @@ CONFIG_SND_OMAP_SOC_RX51=m
CONFIG_SND_OMAP_SOC_AM3517EVM=m
CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
CONFIG_SND_OMAP_SOC_OMAP_HDMI=m
CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
##

54
debian/config/config vendored
View File

@ -140,6 +140,11 @@ CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
# CONFIG_ACPI_BGRT is not set
# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
##
## file: drivers/android/Kconfig
##
# CONFIG_ANDROID is not set
##
## file: drivers/ata/Kconfig
##
@ -1562,16 +1567,6 @@ CONFIG_VIDEO_CX25840=m
##
CONFIG_SMS_SDIO_DRV=m
##
## file: drivers/media/parport/Kconfig
##
#. Actually VIDEO_PMS is an ISA driver
CONFIG_MEDIA_PARPORT_SUPPORT=y
# CONFIG_VIDEO_BWQCAM is not set
# CONFIG_VIDEO_CQCAM is not set
CONFIG_VIDEO_PMS=m
# CONFIG_VIDEO_W9966 is not set
##
## file: drivers/media/pci/Kconfig
##
@ -2036,11 +2031,6 @@ CONFIG_VIDEO_STK1160_AC97=y
##
CONFIG_USB_STKWEBCAM=m
##
## file: drivers/media/usb/tlg2300/Kconfig
##
CONFIG_VIDEO_TLG2300=m
##
## file: drivers/media/usb/ttusb-budget/Kconfig
##
@ -2837,7 +2827,6 @@ CONFIG_YAM=m
## file: drivers/net/ieee802154/Kconfig
##
CONFIG_IEEE802154_DRIVERS=m
CONFIG_IEEE802154_FAKEHARD=m
##
## file: drivers/net/irda/Kconfig
@ -3728,26 +3717,11 @@ CONFIG_SSB=m
##
CONFIG_STAGING=y
##
## file: drivers/staging/android/Kconfig
##
# CONFIG_ANDROID is not set
##
## file: drivers/staging/bcm/Kconfig
##
# CONFIG_BCM_WIMAX is not set
##
## file: drivers/staging/comedi/Kconfig
##
# CONFIG_COMEDI is not set
##
## file: drivers/staging/cptm1217/Kconfig
##
# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
##
## file: drivers/staging/dgap/Kconfig
##
@ -3866,11 +3840,6 @@ CONFIG_STAGING=y
# CONFIG_AD2S1200 is not set
# CONFIG_AD2S1210 is not set
##
## file: drivers/staging/line6/Kconfig
##
# CONFIG_LINE6_USB is not set
##
## file: drivers/staging/lustre/lustre/Kconfig
##
@ -5088,7 +5057,6 @@ CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
## choice: RCU Implementation
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
## end choice
# CONFIG_TASKS_RCU is not set
# CONFIG_RCU_USER_QS is not set
@ -5097,8 +5065,8 @@ CONFIG_RCU_FANOUT=32
CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=17
# CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
CONFIG_NUMA_BALANCING=y
# CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
CONFIG_CGROUPS=y
# CONFIG_CGROUP_DEBUG is not set
CONFIG_CGROUP_FREEZER=y
@ -5106,7 +5074,6 @@ CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y
CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_MEMCG=y
CONFIG_MEMCG_DISABLED=y
CONFIG_MEMCG_SWAP=y
@ -5199,13 +5166,12 @@ CONFIG_HZ_250=y
##
## file: kernel/power/Kconfig
##
CONFIG_PM=y
CONFIG_SUSPEND=y
CONFIG_HIBERNATION=y
CONFIG_PM_STD_PARTITION=""
# CONFIG_PM_AUTOSLEEP is not set
# CONFIG_PM_WAKELOCKS is not set
CONFIG_PM_RUNTIME=y
CONFIG_PM=y
CONFIG_PM_DEBUG=y
CONFIG_PM_ADVANCED_DEBUG=y
#. Could be enabled if it becomes configurable at run-time
@ -5598,6 +5564,10 @@ CONFIG_DNS_RESOLVER=m
## file: net/ieee802154/Kconfig
##
CONFIG_IEEE802154=m
##
## file: net/ieee802154/6lowpan/Kconfig
##
CONFIG_IEEE802154_6LOWPAN=m
##
@ -6115,7 +6085,6 @@ CONFIG_SUNRPC_XPRT_RDMA_SERVER=m
## file: net/tipc/Kconfig
##
CONFIG_TIPC=m
CONFIG_TIPC_PORTS=8191
CONFIG_TIPC_MEDIA_IB=y
##
@ -6197,7 +6166,6 @@ CONFIG_KEYS=y
# CONFIG_BIG_KEYS is not set
# CONFIG_TRUSTED_KEYS is not set
# CONFIG_ENCRYPTED_KEYS is not set
CONFIG_KEYS_DEBUG_PROC_KEYS=y
##
## file: security/selinux/Kconfig

View File

@ -6,7 +6,6 @@ CONFIG_PA7000=y
# CONFIG_PA8X00 is not set
## end choice
# CONFIG_SMP is not set
# CONFIG_HPUX is not set
##
## file: drivers/net/ethernet/ti/Kconfig

View File

@ -14,7 +14,6 @@ CONFIG_64BIT=y
CONFIG_PAGE_SIZE_4KB=y
## end choice
CONFIG_PCI=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y

View File

@ -9,7 +9,6 @@ CONFIG_MACH_LOONGSON=y
CONFIG_64BIT=y
## end choice
CONFIG_PCI=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y

View File

@ -9,7 +9,6 @@ CONFIG_MACH_LOONGSON=y
CONFIG_64BIT=y
## end choice
CONFIG_PCI=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y

View File

@ -10,7 +10,6 @@ CONFIG_HOTPLUG_CPU=y
CONFIG_64BIT=y
## end choice
CONFIG_SMP=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y

View File

@ -11,7 +11,6 @@ CONFIG_64BIT=y
## end choice
CONFIG_SMP=y
CONFIG_PCI=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
@ -136,7 +135,6 @@ CONFIG_USB_OCTEON_OHCI=y
##
# CONFIG_SUSPEND is not set
# CONFIG_HIBERNATION is not set
# CONFIG_PM_RUNTIME is not set
##
## file: mm/Kconfig

View File

@ -15,7 +15,6 @@ CONFIG_64BIT=y
CONFIG_PAGE_SIZE_4KB=y
## end choice
CONFIG_EISA=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
@ -67,16 +66,6 @@ CONFIG_SERIO_SERPORT=y
CONFIG_SERIO_LIBPS2=y
CONFIG_SERIO_RAW=y
##
## file: drivers/media/parport/Kconfig
##
# CONFIG_MEDIA_PARPORT_SUPPORT is not set
##
## file: drivers/media/platform/Kconfig
##
CONFIG_VIDEO_VINO=m
##
## file: drivers/net/appletalk/Kconfig
##

View File

@ -14,7 +14,6 @@ CONFIG_64BIT=y
CONFIG_PAGE_SIZE_4KB=y
## end choice
CONFIG_PCI=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
@ -79,11 +78,6 @@ CONFIG_SERIO_MACEPS2=y
CONFIG_SERIO_LIBPS2=y
CONFIG_SERIO_RAW=y
##
## file: drivers/media/parport/Kconfig
##
# CONFIG_MEDIA_PARPORT_SUPPORT is not set
##
## file: drivers/media/pci/bt8xx/Kconfig
##

View File

@ -16,7 +16,6 @@ CONFIG_PAGE_SIZE_4KB=y
CONFIG_SMP=y
CONFIG_NR_CPUS=2
CONFIG_PCI=y
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
CONFIG_MIPS32_N32=y
@ -100,11 +99,6 @@ CONFIG_MOUSE_PS2=y
##
CONFIG_SERIO=y
##
## file: drivers/media/parport/Kconfig
##
# CONFIG_MEDIA_PARPORT_SUPPORT is not set
##
## file: drivers/net/appletalk/Kconfig
##

View File

@ -65,10 +65,9 @@ CONFIG_I2C_PASEMI=m
##
## file: drivers/macintosh/Kconfig
##
# CONFIG_THERM_PM72 is not set
CONFIG_WINDFARM_RM31=m
CONFIG_WINDFARM_PM72=m
CONFIG_WINDFARM_PM81=m
CONFIG_WINDFARM_PM72=m
CONFIG_WINDFARM_RM31=m
CONFIG_WINDFARM_PM91=m
CONFIG_WINDFARM_PM112=m
CONFIG_WINDFARM_PM121=m

View File

@ -219,11 +219,6 @@ CONFIG_SERIO_LIBPS2=y
##
# CONFIG_INPUT_TOUCHSCREEN is not set
##
## file: drivers/media/parport/Kconfig
##
# CONFIG_MEDIA_PARPORT_SUPPORT is not set
##
## file: drivers/media/pci/cx88/Kconfig
##

View File

@ -1168,7 +1168,6 @@ CONFIG_NFC_PN544_MEI=m
CONFIG_HT_IRQ=y
CONFIG_PCI_PRI=y
CONFIG_PCI_PASID=y
CONFIG_PCI_IOAPIC=y
##
## file: drivers/pci/hotplug/Kconfig
@ -1354,7 +1353,6 @@ CONFIG_COMEDI_II_PCI20KC=m
CONFIG_COMEDI_S526=m
CONFIG_COMEDI_PCI_DRIVERS=y
CONFIG_COMEDI_8255_PCI=m
CONFIG_COMEDI_ADDI_APCI_035=m
CONFIG_COMEDI_ADDI_APCI_1032=m
CONFIG_COMEDI_ADDI_APCI_1500=m
CONFIG_COMEDI_ADDI_APCI_1516=m
@ -1481,11 +1479,6 @@ CONFIG_LIRC_SERIAL_TRANSMITTER=y
CONFIG_LIRC_SIR=m
CONFIG_LIRC_ZILOG=m
##
## file: drivers/staging/media/omap24xx/Kconfig
##
# CONFIG_VIDEO_TCM825X is not set
##
## file: drivers/staging/rtl8192e/Kconfig
##
@ -1843,7 +1836,7 @@ CONFIG_IRNET=m
CONFIG_LAPB=m
##
## file: net/nfc/Kconfig
## file: net/nfc/hci/Kconfig
##
CONFIG_NFC_HCI=m