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

15 files changed, 32 insertions, 107 deletions

diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 65c02eb9619c..a1618002d3f0 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -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
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index 795ed010ed41..cd0b3aa03ed5 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -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
@@ -124,6 +122,11 @@ CONFIG_OMAP_PM_NOOP=y
 ## end choice
 
 ##
+## file: drivers/amba/Kconfig
+##
+CONFIG_TEGRA_AHB=y
+
+##
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_SATA_AHCI_PLATFORM=m
@@ -221,6 +224,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
 ##
 CONFIG_DRM_OMAP=m
@@ -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
@@ -752,15 +763,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
 ##
 CONFIG_ARMADA_THERMAL=y
@@ -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
 
 ##
diff --git a/debian/config/config b/debian/config/config
index 53b2ecfa239c..62dbadc0a4e6 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -141,6 +141,11 @@ CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
 
 ##
+## file: drivers/android/Kconfig
+##
+# CONFIG_ANDROID is not set
+
+##
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_ATA=m
@@ -1563,16 +1568,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
 ##
 CONFIG_MEDIA_PCI_SUPPORT=y
@@ -2037,11 +2032,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
 ##
 CONFIG_DVB_TTUSB_BUDGET=m
@@ -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
@@ -3729,26 +3718,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
 ##
 # CONFIG_DGAP is not set
@@ -3867,11 +3841,6 @@ CONFIG_STAGING=y
 # CONFIG_AD2S1210 is not set
 
 ##
-## file: drivers/staging/line6/Kconfig
-##
-# CONFIG_LINE6_USB is not set
-
-##
 ## file: drivers/staging/lustre/lustre/Kconfig
 ##
 # CONFIG_LUSTRE_FS is not set
@@ -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
diff --git a/debian/config/hppa/config.parisc b/debian/config/hppa/config.parisc
index d298882278c6..9a07c7962b9c 100644
--- a/debian/config/hppa/config.parisc
+++ b/debian/config/hppa/config.parisc
@@ -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
diff --git a/debian/config/kernelarch-mips/config.5kc-malta b/debian/config/kernelarch-mips/config.5kc-malta
index 3a02751b6327..a1dc85d1f143 100644
--- a/debian/config/kernelarch-mips/config.5kc-malta
+++ b/debian/config/kernelarch-mips/config.5kc-malta
@@ -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
 
diff --git a/debian/config/kernelarch-mips/config.loongson-2e b/debian/config/kernelarch-mips/config.loongson-2e
index 1f399d07929a..09bb6663b79f 100644
--- a/debian/config/kernelarch-mips/config.loongson-2e
+++ b/debian/config/kernelarch-mips/config.loongson-2e
@@ -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
 
diff --git a/debian/config/kernelarch-mips/config.loongson-2f b/debian/config/kernelarch-mips/config.loongson-2f
index a224fd4b352a..dcb2b06da224 100644
--- a/debian/config/kernelarch-mips/config.loongson-2f
+++ b/debian/config/kernelarch-mips/config.loongson-2f
@@ -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
 
diff --git a/debian/config/kernelarch-mips/config.loongson-3 b/debian/config/kernelarch-mips/config.loongson-3
index 4da61f3b57a0..ae35f67e0b53 100644
--- a/debian/config/kernelarch-mips/config.loongson-3
+++ b/debian/config/kernelarch-mips/config.loongson-3
@@ -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
 
diff --git a/debian/config/kernelarch-mips/config.octeon b/debian/config/kernelarch-mips/config.octeon
index 3cc4c6f2b740..c62bfc60ad12 100644
--- a/debian/config/kernelarch-mips/config.octeon
+++ b/debian/config/kernelarch-mips/config.octeon
@@ -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
diff --git a/debian/config/kernelarch-mips/config.r4k-ip22 b/debian/config/kernelarch-mips/config.r4k-ip22
index 9425d1fb37c3..6c8717fa4134 100644
--- a/debian/config/kernelarch-mips/config.r4k-ip22
+++ b/debian/config/kernelarch-mips/config.r4k-ip22
@@ -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
 
@@ -68,16 +67,6 @@ 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
 ##
 # CONFIG_ATALK is not set
diff --git a/debian/config/kernelarch-mips/config.r5k-ip32 b/debian/config/kernelarch-mips/config.r5k-ip32
index 6c1252c25624..f0780166c994 100644
--- a/debian/config/kernelarch-mips/config.r5k-ip32
+++ b/debian/config/kernelarch-mips/config.r5k-ip32
@@ -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
 
@@ -80,11 +79,6 @@ 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
 ##
 # CONFIG_VIDEO_BT848 is not set
diff --git a/debian/config/kernelarch-mips/config.sb1-bcm91250a b/debian/config/kernelarch-mips/config.sb1-bcm91250a
index 081b07002fc5..74c4943af343 100644
--- a/debian/config/kernelarch-mips/config.sb1-bcm91250a
+++ b/debian/config/kernelarch-mips/config.sb1-bcm91250a
@@ -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
 
@@ -101,11 +100,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
 ##
 # CONFIG_ATALK is not set
diff --git a/debian/config/kernelarch-powerpc/config-arch-64-be b/debian/config/kernelarch-powerpc/config-arch-64-be
index f23ad8fd2fa9..28366156a814 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64-be
+++ b/debian/config/kernelarch-powerpc/config-arch-64-be
@@ -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
diff --git a/debian/config/kernelarch-sparc/config b/debian/config/kernelarch-sparc/config
index bb3c79decbba..f093ea283e4c 100644
--- a/debian/config/kernelarch-sparc/config
+++ b/debian/config/kernelarch-sparc/config
@@ -220,11 +220,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
 ##
 # CONFIG_VIDEO_CX88 is not set
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 055d246370db..33df69c9abb6 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -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
@@ -1482,11 +1480,6 @@ 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
 ##
 CONFIG_RTLLIB=m
@@ -1843,7 +1836,7 @@ CONFIG_IRNET=m
 CONFIG_LAPB=m
 
 ##
-## file: net/nfc/Kconfig
+## file: net/nfc/hci/Kconfig
 ##
 CONFIG_NFC_HCI=m