[linux] 02/02: Refresh config symbols for 4.5-rc4

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Mon Feb 15 17:51:09 UTC 2016 

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit c07a4d3987792664c952927ca392a42b37d3a84a
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Feb 15 17:50:19 2016 +0000

    Refresh config symbols for 4.5-rc4
    
    Delete obsolete config symbols; rename/replace some as appropriate.
---
 debian/config/alpha/config                     |  30 +++-
 debian/config/arm64/config                     |   2 +-
 debian/config/armel/config.marvell             |   8 +-
 debian/config/armel/config.versatile           |   7 +-
 debian/config/armhf/config.armmp               |  58 +++----
 debian/config/config                           | 217 +++++++++++++------------
 debian/config/hppa/config                      |  20 ++-
 debian/config/kernelarch-arm/config            |   2 +-
 debian/config/kernelarch-mips/config.4kc-malta |  22 ++-
 debian/config/kernelarch-mips/config.5kc-malta |  22 ++-
 debian/config/kernelarch-powerpc/config        |  32 ++--
 debian/config/kernelarch-s390/config           |   7 +-
 debian/config/kernelarch-sparc/config          |   2 +-
 debian/config/kernelarch-x86/config            |  34 ++--
 debian/config/kernelarch-x86/config-arch-32    |   2 +-
 debian/config/kernelarch-x86/config-arch-64    |   2 +-
 16 files changed, 258 insertions(+), 209 deletions(-)

diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index 5b31c5d..77dc60e 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -692,26 +692,27 @@ CONFIG_SDLA=m
 ## file: drivers/net/wireless/Kconfig
 ##
 CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
+
+##
+## file: drivers/net/wireless/atmel/Kconfig
+##
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PCMCIA_ATMEL=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_USB_ZD1201=m
 
 ##
-## file: drivers/net/wireless/ipw2x00/Kconfig
+## file: drivers/net/wireless/cisco/Kconfig
 ##
-# CONFIG_IPW2100 is not set
+CONFIG_AIRO_CS=m
 
 ##
-## file: drivers/net/wireless/mwifiex/Kconfig
+## file: drivers/net/wireless/intel/ipw2x00/Kconfig
 ##
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
+# CONFIG_IPW2100 is not set
 
 ##
-## file: drivers/net/wireless/orinoco/Kconfig
+## file: drivers/net/wireless/intersil/orinoco/Kconfig
 ##
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -720,6 +721,17 @@ CONFIG_PCI_HERMES=m
 CONFIG_PCMCIA_HERMES=m
 
 ##
+## file: drivers/net/wireless/marvell/mwifiex/Kconfig
+##
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+
+##
+## file: drivers/net/wireless/zydas/Kconfig
+##
+CONFIG_USB_ZD1201=m
+
+##
 ## file: drivers/pcmcia/Kconfig
 ##
 CONFIG_PCCARD=m
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index e68bf96..3615b18 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -292,7 +292,6 @@ CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
-CONFIG_SERIAL_OF_PLATFORM=y
 
 ##
 ## file: drivers/tty/serial/8250/Kconfig
@@ -306,6 +305,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_EM is not set
+CONFIG_SERIAL_OF_PLATFORM=y
 
 ##
 ## file: drivers/usb/gadget/Kconfig
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index 22392dd..ed9308d 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -485,7 +485,7 @@ CONFIG_MVMDIO=m
 # CONFIG_VIA_VELOCITY is not set
 
 ##
-## file: drivers/net/wireless/mwifiex/Kconfig
+## file: drivers/net/wireless/marvell/mwifiex/Kconfig
 ##
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
@@ -604,11 +604,6 @@ CONFIG_FB_XGI=m
 CONFIG_KIRKWOOD_THERMAL=m
 
 ##
-## file: drivers/tty/serial/Kconfig
-##
-CONFIG_SERIAL_OF_PLATFORM=y
-
-##
 ## file: drivers/tty/serial/8250/Kconfig
 ##
 CONFIG_SERIAL_8250=y
@@ -617,6 +612,7 @@ CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=2
 # CONFIG_SERIAL_8250_EXTENDED is not set
 # CONFIG_SERIAL_8250_DW is not set
+CONFIG_SERIAL_OF_PLATFORM=y
 
 ##
 ## file: drivers/usb/Kconfig
diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile
index af5c2e6..98ce24a 100644
--- a/debian/config/armel/config.versatile
+++ b/debian/config/armel/config.versatile
@@ -1,9 +1,6 @@
 ##
 ## file: arch/arm/Kconfig
 ##
-## choice: ARM system type
-CONFIG_ARCH_VERSATILE=y
-## end choice
 CONFIG_PCI=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
@@ -28,13 +25,11 @@ CONFIG_VFP=y
 ##
 ## file: arch/arm/mach-versatile/Kconfig
 ##
-CONFIG_ARCH_VERSATILE_PB=y
-CONFIG_MACH_VERSATILE_AB=y
+CONFIG_ARCH_VERSATILE=y
 
 ##
 ## file: arch/arm/mm/Kconfig
 ##
-CONFIG_CPU_ARM926T=y
 CONFIG_ARM_THUMB=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index cd7787a..850a45a 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -102,10 +102,6 @@ CONFIG_ARCH_SUNXI=y
 ## file: arch/arm/mach-tegra/Kconfig
 ##
 CONFIG_ARCH_TEGRA=y
-# CONFIG_ARCH_TEGRA_2x_SOC is not set
-# CONFIG_ARCH_TEGRA_3x_SOC is not set
-# CONFIG_ARCH_TEGRA_114_SOC is not set
-CONFIG_ARCH_TEGRA_124_SOC=y
 
 ##
 ## file: arch/arm/mach-vexpress/Kconfig
@@ -140,11 +136,6 @@ CONFIG_OMAP_PM_NOOP=y
 ## end choice
 
 ##
-## file: drivers/amba/Kconfig
-##
-CONFIG_TEGRA_AHB=y
-
-##
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_SATA_AHCI_PLATFORM=m
@@ -254,7 +245,6 @@ 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
 
@@ -264,6 +254,22 @@ CONFIG_DRM_IMX_HDMI=m
 CONFIG_DRM_OMAP=m
 
 ##
+## file: drivers/gpu/drm/omapdrm/displays/Kconfig
+##
+CONFIG_DISPLAY_ENCODER_TPD12S015=m
+CONFIG_DISPLAY_CONNECTOR_HDMI=m
+CONFIG_DISPLAY_PANEL_SONY_ACX565AKM=m
+
+##
+## file: drivers/gpu/drm/omapdrm/dss/Kconfig
+##
+CONFIG_OMAP2_DSS=m
+CONFIG_OMAP2_DSS_VENC=y
+CONFIG_OMAP4_DSS_HDMI=y
+CONFIG_OMAP5_DSS_HDMI=y
+CONFIG_OMAP2_DSS_SDI=y
+
+##
 ## file: drivers/gpu/drm/rockchip/Kconfig
 ##
 CONFIG_DRM_ROCKCHIP=m
@@ -273,7 +279,6 @@ CONFIG_ROCKCHIP_DW_HDMI=m
 ## file: drivers/gpu/drm/tegra/Kconfig
 ##
 CONFIG_DRM_TEGRA=m
-CONFIG_DRM_TEGRA_FBDEV=y
 # CONFIG_DRM_TEGRA_DEBUG is not set
 # CONFIG_DRM_TEGRA_STAGING is not set
 
@@ -690,7 +695,7 @@ CONFIG_SKFP=m
 CONFIG_MDIO_SUN4I=y
 
 ##
-## file: drivers/net/wireless/brcm80211/Kconfig
+## file: drivers/net/wireless/broadcom/brcm80211/Kconfig
 ##
 CONFIG_BRCMFMAC=m
 CONFIG_BRCMFMAC_SDIO=y
@@ -698,7 +703,7 @@ CONFIG_BRCMFMAC_SDIO=y
 ##
 ## file: drivers/net/wireless/ti/Kconfig
 ##
-CONFIG_WL_TI=y
+CONFIG_WLAN_VENDOR_TI=y
 CONFIG_WILINK_PLATFORM_DATA=y
 
 ##
@@ -864,6 +869,14 @@ CONFIG_SCSI_AM53C974=m
 CONFIG_RASPBERRYPI_POWER=y
 
 ##
+## file: drivers/soc/tegra/Kconfig
+##
+# CONFIG_ARCH_TEGRA_2x_SOC is not set
+# CONFIG_ARCH_TEGRA_3x_SOC is not set
+# CONFIG_ARCH_TEGRA_114_SOC is not set
+CONFIG_ARCH_TEGRA_124_SOC=y
+
+##
 ## file: drivers/spi/Kconfig
 ##
 CONFIG_SPI=y
@@ -915,7 +928,6 @@ CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
 CONFIG_SERIAL_VT8500=y
 CONFIG_SERIAL_VT8500_CONSOLE=y
-CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
 CONFIG_SERIAL_ARC=y
@@ -934,6 +946,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_EM is not set
+CONFIG_SERIAL_OF_PLATFORM=y
 
 ##
 ## file: drivers/usb/Kconfig
@@ -946,7 +959,6 @@ CONFIG_USB=m
 CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA_DEBUG=y
 
 ##
 ## file: drivers/usb/dwc2/Kconfig
@@ -1046,22 +1058,6 @@ CONFIG_FB_WM8505=y
 CONFIG_FB_SIMPLE=y
 
 ##
-## file: drivers/video/fbdev/omap2/displays-new/Kconfig
-##
-CONFIG_DISPLAY_ENCODER_TPD12S015=m
-CONFIG_DISPLAY_CONNECTOR_HDMI=m
-CONFIG_DISPLAY_PANEL_SONY_ACX565AKM=m
-
-##
-## file: drivers/video/fbdev/omap2/dss/Kconfig
-##
-CONFIG_OMAP2_DSS=m
-CONFIG_OMAP2_DSS_VENC=y
-CONFIG_OMAP4_DSS_HDMI=y
-CONFIG_OMAP5_DSS_HDMI=y
-CONFIG_OMAP2_DSS_SDI=y
-
-##
 ## file: drivers/video/fbdev/omap2/omapfb/Kconfig
 ##
 CONFIG_FB_OMAP2=m
diff --git a/debian/config/config b/debian/config/config
index c6ec239..80671b3 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -620,7 +620,6 @@ CONFIG_DRM_QXL=m
 ## file: drivers/gpu/drm/radeon/Kconfig
 ##
 # CONFIG_DRM_RADEON_USERPTR is not set
-# CONFIG_DRM_RADEON_UMS is not set
 
 ##
 ## file: drivers/gpu/drm/udl/Kconfig
@@ -795,7 +794,6 @@ CONFIG_SENSORS_MAX1668=m
 CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
-# CONFIG_SENSORS_HTU21 is not set
 # CONFIG_SENSORS_MCP3021 is not set
 CONFIG_SENSORS_ADCXX=m
 CONFIG_SENSORS_LM70=m
@@ -1001,6 +999,11 @@ CONFIG_VIPERBOARD_ADC=m
 # CONFIG_MCP4922 is not set
 
 ##
+## file: drivers/iio/dummy/Kconfig
+##
+# CONFIG_IIO_SIMPLE_DUMMY is not set
+
+##
 ## file: drivers/iio/frequency/Kconfig
 ##
 # CONFIG_AD9523 is not set
@@ -1563,6 +1566,7 @@ CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
 CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
@@ -1593,11 +1597,6 @@ CONFIG_BCACHE=m
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 
 ##
-## file: drivers/md/persistent-data/Kconfig
-##
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-
-##
 ## file: drivers/media/Kconfig
 ##
 CONFIG_MEDIA_SUPPORT=m
@@ -3289,21 +3288,18 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 ## file: drivers/net/wireless/Kconfig
 ##
 CONFIG_WLAN=y
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AIRO=m
-CONFIG_AT76C50X_USB=m
-# CONFIG_PRISM54 is not set
+CONFIG_MAC80211_HWSIM=m
 CONFIG_USB_NET_RNDIS_WLAN=m
+
+##
+## file: drivers/net/wireless/admtek/Kconfig
+##
 CONFIG_ADM8211=m
-CONFIG_MAC80211_HWSIM=m
-CONFIG_MWL8K=m
 
 ##
 ## file: drivers/net/wireless/ath/Kconfig
 ##
-CONFIG_ATH_CARDS=y
+CONFIG_WLAN_VENDOR_ATH=y
 # CONFIG_ATH_DEBUG is not set
 
 ##
@@ -3372,7 +3368,12 @@ CONFIG_WIL6210_ISR_COR=y
 CONFIG_WIL6210_TRACING=y
 
 ##
-## file: drivers/net/wireless/b43/Kconfig
+## file: drivers/net/wireless/atmel/Kconfig
+##
+CONFIG_AT76C50X_USB=m
+
+##
+## file: drivers/net/wireless/broadcom/b43/Kconfig
 ##
 CONFIG_B43=m
 CONFIG_B43_SDIO=y
@@ -3383,7 +3384,7 @@ CONFIG_B43_PHY_HT=y
 # CONFIG_B43_DEBUG is not set
 
 ##
-## file: drivers/net/wireless/b43legacy/Kconfig
+## file: drivers/net/wireless/broadcom/b43legacy/Kconfig
 ##
 CONFIG_B43LEGACY=m
 CONFIG_B43LEGACY_DEBUG=y
@@ -3394,7 +3395,7 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 ## end choice
 
 ##
-## file: drivers/net/wireless/brcm80211/Kconfig
+## file: drivers/net/wireless/broadcom/brcm80211/Kconfig
 ##
 CONFIG_BRCMSMAC=m
 CONFIG_BRCMFMAC=m
@@ -3405,22 +3406,12 @@ CONFIG_BRCMFMAC_PCIE=y
 # CONFIG_BRCMDBG is not set
 
 ##
-## file: drivers/net/wireless/cw1200/Kconfig
-##
-# CONFIG_CW1200 is not set
-
-##
-## file: drivers/net/wireless/hostap/Kconfig
+## file: drivers/net/wireless/cisco/Kconfig
 ##
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
+CONFIG_AIRO=m
 
 ##
-## file: drivers/net/wireless/ipw2x00/Kconfig
+## file: drivers/net/wireless/intel/ipw2x00/Kconfig
 ##
 CONFIG_IPW2200=m
 CONFIG_IPW2200_MONITOR=y
@@ -3431,14 +3422,14 @@ CONFIG_IPW2200_QOS=y
 # CONFIG_LIBIPW_DEBUG is not set
 
 ##
-## file: drivers/net/wireless/iwlegacy/Kconfig
+## file: drivers/net/wireless/intel/iwlegacy/Kconfig
 ##
 CONFIG_IWL4965=m
 CONFIG_IWL3945=m
 # CONFIG_IWLEGACY_DEBUG is not set
 
 ##
-## file: drivers/net/wireless/iwlwifi/Kconfig
+## file: drivers/net/wireless/intel/iwlwifi/Kconfig
 ##
 CONFIG_IWLWIFI=m
 CONFIG_IWLDVM=m
@@ -3449,28 +3440,22 @@ CONFIG_IWLMVM=m
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
 
 ##
-## file: drivers/net/wireless/libertas/Kconfig
+## file: drivers/net/wireless/intersil/Kconfig
 ##
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_SPI is not set
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-
-##
-## file: drivers/net/wireless/mediatek/Kconfig
-##
-CONFIG_WL_MEDIATEK=y
+# CONFIG_PRISM54 is not set
 
 ##
-## file: drivers/net/wireless/mediatek/mt7601u/Kconfig
+## file: drivers/net/wireless/intersil/hostap/Kconfig
 ##
-CONFIG_MT7601U=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
 
 ##
-## file: drivers/net/wireless/orinoco/Kconfig
+## file: drivers/net/wireless/intersil/orinoco/Kconfig
 ##
 # CONFIG_HERMES_PRISM is not set
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
@@ -3479,7 +3464,7 @@ CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_ORINOCO_USB=m
 
 ##
-## file: drivers/net/wireless/p54/Kconfig
+## file: drivers/net/wireless/intersil/p54/Kconfig
 ##
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
@@ -3488,6 +3473,62 @@ CONFIG_P54_PCI=m
 # CONFIG_P54_SPI_DEFAULT_EEPROM is not set
 
 ##
+## file: drivers/net/wireless/marvell/Kconfig
+##
+CONFIG_MWL8K=m
+
+##
+## file: drivers/net/wireless/marvell/libertas/Kconfig
+##
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+
+##
+## file: drivers/net/wireless/marvell/libertas_tf/Kconfig
+##
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+
+##
+## file: drivers/net/wireless/mediatek/Kconfig
+##
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+
+##
+## file: drivers/net/wireless/mediatek/mt7601u/Kconfig
+##
+CONFIG_MT7601U=m
+
+##
+## file: drivers/net/wireless/ralink/rt2x00/Kconfig
+##
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+# CONFIG_RT2800USB_UNKNOWN is not set
+# CONFIG_RT2X00_DEBUG is not set
+
+##
 ## file: drivers/net/wireless/realtek/rtl818x/Kconfig
 ##
 CONFIG_RTL8180=m
@@ -3517,35 +3558,17 @@ CONFIG_RSI_DEBUGFS=y
 CONFIG_RSI_USB=m
 
 ##
-## file: drivers/net/wireless/rt2x00/Kconfig
+## file: drivers/net/wireless/st/cw1200/Kconfig
 ##
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-# CONFIG_RT2800USB_UNKNOWN is not set
-# CONFIG_RT2X00_DEBUG is not set
+# CONFIG_CW1200 is not set
 
 ##
 ## file: drivers/net/wireless/ti/Kconfig
 ##
-# CONFIG_WL_TI is not set
+# CONFIG_WLAN_VENDOR_TI is not set
 
 ##
-## file: drivers/net/wireless/zd1211rw/Kconfig
+## file: drivers/net/wireless/zydas/zd1211rw/Kconfig
 ##
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
@@ -3567,7 +3590,7 @@ CONFIG_NFC_PORT100=m
 ##
 ## file: drivers/nfc/st21nfca/Kconfig
 ##
-# CONFIG_NFC_ST21NFCA is not set
+# CONFIG_NFC_ST21NFCA_I2C is not set
 
 ##
 ## file: drivers/ntb/Kconfig
@@ -4138,11 +4161,6 @@ CONFIG_STAGING=y
 # CONFIG_GS_FPGABOOT is not set
 
 ##
-## file: drivers/staging/iio/Kconfig
-##
-# CONFIG_IIO_SIMPLE_DUMMY is not set
-
-##
 ## file: drivers/staging/iio/accel/Kconfig
 ##
 # CONFIG_ADIS16201 is not set
@@ -4257,17 +4275,6 @@ CONFIG_STAGING=y
 # CONFIG_STAGING_RDMA is not set
 
 ##
-## file: drivers/staging/rdma/amso1100/Kconfig
-##
-CONFIG_INFINIBAND_AMSO1100=m
-# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
-
-##
-## file: drivers/staging/rdma/ipath/Kconfig
-##
-CONFIG_INFINIBAND_IPATH=m
-
-##
 ## file: drivers/staging/rtl8188eu/Kconfig
 ##
 CONFIG_R8188EU=m
@@ -4436,7 +4443,6 @@ CONFIG_HVC_XEN_FRONTEND=y
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX310X is not set
 # CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_OF_PLATFORM=m
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_TIMBERDALE is not set
@@ -4465,6 +4471,7 @@ CONFIG_SERIAL_8250_HUB6=m
 # CONFIG_SERIAL_8250_DW is not set
 # CONFIG_SERIAL_8250_RT288X is not set
 # CONFIG_SERIAL_8250_MID is not set
+CONFIG_SERIAL_OF_PLATFORM=m
 
 ##
 ## file: drivers/uio/Kconfig
@@ -4652,7 +4659,6 @@ CONFIG_USB_MON=y
 # CONFIG_USB_MSM_OTG is not set
 # CONFIG_USB_MV_OTG is not set
 # CONFIG_USB_MXS_PHY is not set
-# CONFIG_USB_RCAR_PHY is not set
 # CONFIG_USB_ULPI is not set
 
 ##
@@ -5489,7 +5495,6 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_FHANDLE=y
 # CONFIG_USELIB is not set
 CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
@@ -5506,26 +5511,25 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 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
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_DISABLED=y
 CONFIG_MEMCG_SWAP=y
 # CONFIG_MEMCG_SWAP_ENABLED is not set
-# CONFIG_MEMCG_KMEM is not set
-# CONFIG_CGROUP_HUGETLB is not set
-CONFIG_CGROUP_PERF=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 # CONFIG_RT_GROUP_SCHED is not set
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+# CONFIG_CGROUP_HUGETLB is not set
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+# CONFIG_CGROUP_DEBUG is not set
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
@@ -6769,7 +6773,6 @@ CONFIG_SND_FIREWIRE=y
 CONFIG_SND_DICE=m
 CONFIG_SND_OXFW=m
 CONFIG_SND_ISIGHT=m
-CONFIG_SND_SCS1X=m
 CONFIG_SND_FIREWORKS=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
@@ -6878,7 +6881,7 @@ CONFIG_SND_PDAUDIOCF=m
 # CONFIG_SND_SOC_ES8328 is not set
 # CONFIG_SND_SOC_GTM601 is not set
 # CONFIG_SND_SOC_PCM1681 is not set
-# CONFIG_SND_SOC_PCM1792A is not set
+# CONFIG_SND_SOC_PCM179X is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
 # CONFIG_SND_SOC_RT5631 is not set
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index 795308c..37cb94f 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -350,18 +350,25 @@ CONFIG_PLIP=m
 ## file: drivers/net/wireless/Kconfig
 ##
 CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
+
+##
+## file: drivers/net/wireless/atmel/Kconfig
+##
 # CONFIG_ATMEL is not set
+
+##
+## file: drivers/net/wireless/cisco/Kconfig
+##
 CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-# CONFIG_USB_ZD1201 is not set
 
 ##
-## file: drivers/net/wireless/ipw2x00/Kconfig
+## file: drivers/net/wireless/intel/ipw2x00/Kconfig
 ##
 # CONFIG_IPW2100 is not set
 
 ##
-## file: drivers/net/wireless/orinoco/Kconfig
+## file: drivers/net/wireless/intersil/orinoco/Kconfig
 ##
 CONFIG_HERMES=m
 # CONFIG_PLX_HERMES is not set
@@ -370,6 +377,11 @@ CONFIG_HERMES=m
 CONFIG_PCMCIA_HERMES=m
 
 ##
+## file: drivers/net/wireless/zydas/Kconfig
+##
+# CONFIG_USB_ZD1201 is not set
+
+##
 ## file: drivers/parisc/Kconfig
 ##
 CONFIG_GSC=y
diff --git a/debian/config/kernelarch-arm/config b/debian/config/kernelarch-arm/config
index ef877a9..7c23afc 100644
--- a/debian/config/kernelarch-arm/config
+++ b/debian/config/kernelarch-arm/config
@@ -49,7 +49,7 @@ CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MTD_PHYSMAP=y
 
 ##
-## file: drivers/net/wireless/ipw2x00/Kconfig
+## file: drivers/net/wireless/intel/ipw2x00/Kconfig
 ##
 # CONFIG_IPW2100 is not set
 
diff --git a/debian/config/kernelarch-mips/config.4kc-malta b/debian/config/kernelarch-mips/config.4kc-malta
index 02d19e2..8cb4a5d 100644
--- a/debian/config/kernelarch-mips/config.4kc-malta
+++ b/debian/config/kernelarch-mips/config.4kc-malta
@@ -305,31 +305,35 @@ CONFIG_SIGMATEL_FIR=m
 CONFIG_VLSI_FIR=m
 
 ##
-## file: drivers/net/wireless/Kconfig
+## file: drivers/net/wireless/atmel/Kconfig
 ##
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
-CONFIG_USB_ZD1201=m
 
 ##
-## file: drivers/net/wireless/ipw2x00/Kconfig
+## file: drivers/net/wireless/intel/ipw2x00/Kconfig
 ##
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
 
 ##
-## file: drivers/net/wireless/mwifiex/Kconfig
+## file: drivers/net/wireless/intersil/orinoco/Kconfig
+##
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_PCI_HERMES=m
+
+##
+## file: drivers/net/wireless/marvell/mwifiex/Kconfig
 ##
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 
 ##
-## file: drivers/net/wireless/orinoco/Kconfig
+## file: drivers/net/wireless/zydas/Kconfig
 ##
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
+CONFIG_USB_ZD1201=m
 
 ##
 ## file: drivers/pci/pcie/Kconfig
diff --git a/debian/config/kernelarch-mips/config.5kc-malta b/debian/config/kernelarch-mips/config.5kc-malta
index 864afd3..cfdf231 100644
--- a/debian/config/kernelarch-mips/config.5kc-malta
+++ b/debian/config/kernelarch-mips/config.5kc-malta
@@ -307,31 +307,35 @@ CONFIG_SIGMATEL_FIR=m
 CONFIG_VLSI_FIR=m
 
 ##
-## file: drivers/net/wireless/Kconfig
+## file: drivers/net/wireless/atmel/Kconfig
 ##
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
-CONFIG_USB_ZD1201=m
 
 ##
-## file: drivers/net/wireless/ipw2x00/Kconfig
+## file: drivers/net/wireless/intel/ipw2x00/Kconfig
 ##
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
 
 ##
-## file: drivers/net/wireless/mwifiex/Kconfig
+## file: drivers/net/wireless/intersil/orinoco/Kconfig
+##
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_PCI_HERMES=m
+
+##
+## file: drivers/net/wireless/marvell/mwifiex/Kconfig
 ##
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 
 ##
-## file: drivers/net/wireless/orinoco/Kconfig
+## file: drivers/net/wireless/zydas/Kconfig
 ##
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
+CONFIG_USB_ZD1201=m
 
 ##
 ## file: drivers/pci/pcie/Kconfig
diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config
index 16d45b2..c5bde28 100644
--- a/debian/config/kernelarch-powerpc/config
+++ b/debian/config/kernelarch-powerpc/config
@@ -620,27 +620,27 @@ CONFIG_DLCI_MAX=8
 ## file: drivers/net/wireless/Kconfig
 ##
 CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
+
+##
+## file: drivers/net/wireless/atmel/Kconfig
+##
 CONFIG_ATMEL=m
 # CONFIG_PCI_ATMEL is not set
 CONFIG_PCMCIA_ATMEL=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_USB_ZD1201=m
 
 ##
-## file: drivers/net/wireless/ipw2x00/Kconfig
+## file: drivers/net/wireless/cisco/Kconfig
 ##
-# CONFIG_IPW2100 is not set
+CONFIG_AIRO_CS=m
 
 ##
-## file: drivers/net/wireless/mwifiex/Kconfig
+## file: drivers/net/wireless/intel/ipw2x00/Kconfig
 ##
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
+# CONFIG_IPW2100 is not set
 
 ##
-## file: drivers/net/wireless/orinoco/Kconfig
+## file: drivers/net/wireless/intersil/orinoco/Kconfig
 ##
 CONFIG_HERMES=m
 CONFIG_APPLE_AIRPORT=m
@@ -650,6 +650,18 @@ CONFIG_PCI_HERMES=m
 CONFIG_PCMCIA_HERMES=m
 
 ##
+## file: drivers/net/wireless/marvell/mwifiex/Kconfig
+##
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+
+##
+## file: drivers/net/wireless/zydas/Kconfig
+##
+CONFIG_USB_ZD1201=m
+
+##
 ## file: drivers/pci/hotplug/Kconfig
 ##
 # CONFIG_HOTPLUG_PCI is not set
diff --git a/debian/config/kernelarch-s390/config b/debian/config/kernelarch-s390/config
index 74e4a09..89108dc 100644
--- a/debian/config/kernelarch-s390/config
+++ b/debian/config/kernelarch-s390/config
@@ -29,7 +29,6 @@ CONFIG_S390_GUEST=y
 ##
 ## file: arch/s390/Kconfig.debug
 ##
-CONFIG_STRICT_DEVMEM=y
 # CONFIG_S390_PTDUMP is not set
 
 ##
@@ -118,7 +117,6 @@ CONFIG_SCLP_TTY=y
 CONFIG_SCLP_CONSOLE=y
 CONFIG_SCLP_VT220_TTY=y
 CONFIG_SCLP_VT220_CONSOLE=y
-CONFIG_SCLP_CPI=m
 CONFIG_SCLP_ASYNC=m
 CONFIG_S390_TAPE=m
 CONFIG_S390_TAPE_34XX=m
@@ -161,6 +159,11 @@ CONFIG_DIAG288_WATCHDOG=m
 # CONFIG_PCI_QUIRKS is not set
 
 ##
+## file: lib/Kconfig.debug
+##
+CONFIG_STRICT_DEVMEM=y
+
+##
 ## file: mm/Kconfig
 ##
 ## choice: Memory model
diff --git a/debian/config/kernelarch-sparc/config b/debian/config/kernelarch-sparc/config
index cb0514f..e62f26e 100644
--- a/debian/config/kernelarch-sparc/config
+++ b/debian/config/kernelarch-sparc/config
@@ -383,7 +383,7 @@ CONFIG_PLIP=m
 # CONFIG_WAN is not set
 
 ##
-## file: drivers/net/wireless/mwifiex/Kconfig
+## file: drivers/net/wireless/marvell/mwifiex/Kconfig
 ##
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_PCIE=m
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index f9a9e6d..2cfe262 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -81,7 +81,6 @@ CONFIG_IA32_AOUT=y
 ##
 ## file: arch/x86/Kconfig.debug
 ##
-CONFIG_STRICT_DEVMEM=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
@@ -1212,29 +1211,28 @@ CONFIG_DLCI_MAX=8
 ## file: drivers/net/wireless/Kconfig
 ##
 CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
+
+##
+## file: drivers/net/wireless/atmel/Kconfig
+##
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PCMCIA_ATMEL=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_USB_ZD1201=m
 
 ##
-## file: drivers/net/wireless/brcm80211/Kconfig
+## file: drivers/net/wireless/broadcom/brcm80211/Kconfig
 ##
 #. Sony Vaio laptops
 CONFIG_BRCMFMAC_SDIO=y
 
 ##
-## file: drivers/net/wireless/mwifiex/Kconfig
+## file: drivers/net/wireless/cisco/Kconfig
 ##
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
+CONFIG_AIRO_CS=m
 
 ##
-## file: drivers/net/wireless/orinoco/Kconfig
+## file: drivers/net/wireless/intersil/orinoco/Kconfig
 ##
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1243,6 +1241,19 @@ CONFIG_PCI_HERMES=m
 CONFIG_PCMCIA_HERMES=m
 
 ##
+## file: drivers/net/wireless/marvell/mwifiex/Kconfig
+##
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+
+##
+## file: drivers/net/wireless/zydas/Kconfig
+##
+CONFIG_USB_ZD1201=m
+
+##
 ## file: drivers/nfc/Kconfig
 ##
 CONFIG_NFC_MEI_PHY=m
@@ -1878,6 +1889,7 @@ CONFIG_MMIOTRACE=y
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 CONFIG_MEMTEST=y
+CONFIG_STRICT_DEVMEM=y
 
 ##
 ## file: lib/xz/Kconfig
diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32
index 2f07a69..b45a823 100644
--- a/debian/config/kernelarch-x86/config-arch-32
+++ b/debian/config/kernelarch-x86/config-arch-32
@@ -325,7 +325,7 @@ CONFIG_C101=m
 CONFIG_SDLA=m
 
 ##
-## file: drivers/net/wireless/ipw2x00/Kconfig
+## file: drivers/net/wireless/intel/ipw2x00/Kconfig
 ##
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64
index 18c0a9f..ede7b19 100644
--- a/debian/config/kernelarch-x86/config-arch-64
+++ b/debian/config/kernelarch-x86/config-arch-64
@@ -137,7 +137,7 @@ CONFIG_FUJITSU_ES=m
 # CONFIG_8139TOO_PIO is not set
 
 ##
-## file: drivers/net/wireless/ipw2x00/Kconfig
+## file: drivers/net/wireless/intel/ipw2x00/Kconfig
 ##
 # CONFIG_IPW2100 is not set
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git

More information about the Kernel-svn-changes mailing list