[linux] 03/03: Clean up config for 4.4
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Thu Dec 10 18:47:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository linux.
commit f6ee96a5ac4226b206521d957a00aebed9683d5c
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Thu Dec 10 18:46:19 2015 +0000
Clean up config for 4.4
Done with kconfigeditor2/process.py followed by renaming/deleting
symbols according to the upstream changes.
---
debian/config/armel/config.kirkwood | 6 --
debian/config/armel/config.orion5x | 5 --
debian/config/armel/config.versatile | 5 --
debian/config/armhf/config.armmp | 2 +-
debian/config/config | 99 +++++++++++--------------
debian/config/kernelarch-powerpc/config-arch-64 | 1 -
debian/config/kernelarch-x86/config | 5 +-
7 files changed, 45 insertions(+), 78 deletions(-)
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index ea83d5d..bd2a7dd 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -35,7 +35,6 @@ CONFIG_DEBUG_MVEBU_UART0_ALTERNATE=y
##
CONFIG_ARCH_MVEBU=y
CONFIG_MACH_KIRKWOOD=y
-CONFIG_MACH_NETXBIG=y
##
## file: arch/arm/mm/Kconfig
@@ -374,11 +373,6 @@ CONFIG_MTD_SPI_NOR=y
# CONFIG_DL2K is not set
##
-## file: drivers/net/ethernet/icplus/Kconfig
-##
-# CONFIG_IP1000 is not set
-
-##
## file: drivers/net/ethernet/intel/Kconfig
##
# CONFIG_E1000 is not set
diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x
index 35ef0ff..5727d4a 100644
--- a/debian/config/armel/config.orion5x
+++ b/debian/config/armel/config.orion5x
@@ -371,11 +371,6 @@ CONFIG_MTD_NAND_ORION=y
# CONFIG_DL2K is not set
##
-## file: drivers/net/ethernet/icplus/Kconfig
-##
-# CONFIG_IP1000 is not set
-
-##
## file: drivers/net/ethernet/intel/Kconfig
##
# CONFIG_E1000 is not set
diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile
index 203dd9f..af5c2e6 100644
--- a/debian/config/armel/config.versatile
+++ b/debian/config/armel/config.versatile
@@ -229,11 +229,6 @@ CONFIG_SUNDANCE=m
CONFIG_HP100=m
##
-## file: drivers/net/ethernet/icplus/Kconfig
-##
-# CONFIG_IP1000 is not set
-
-##
## file: drivers/net/ethernet/intel/Kconfig
##
CONFIG_E100=m
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index 285f9c3..47c635e 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -704,7 +704,7 @@ CONFIG_PINCTRL_WM8850=y
##
## file: drivers/power/Kconfig
##
-CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_BQ27XXX=m
CONFIG_BATTERY_RX51=m
CONFIG_CHARGER_ISP1704=m
CONFIG_CHARGER_BQ2415X=m
diff --git a/debian/config/config b/debian/config/config
index 5dbc43a..61d13fd 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -287,7 +287,6 @@ CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_NVME=m
CONFIG_BLK_DEV_SKD=m
CONFIG_BLK_DEV_OSD=m
CONFIG_BLK_DEV_RAM=m
@@ -484,10 +483,10 @@ CONFIG_EFI_VARS_PSTORE=m
# CONFIG_GPIO_SYSFS is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_IT87 is not set
# CONFIG_GPIO_SCH311X is not set
# CONFIG_GPIO_TS5500 is not set
-# CONFIG_GPIO_VX855 is not set
# CONFIG_GPIO_ADP5588 is not set
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX732X is not set
@@ -500,8 +499,8 @@ CONFIG_EFI_VARS_PSTORE=m
# CONFIG_GPIO_RDC321X is not set
# CONFIG_GPIO_74X164 is not set
# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MCP23S08 is not set
# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_MCP23S08 is not set
CONFIG_GPIO_VIPERBOARD=m
##
@@ -843,9 +842,6 @@ CONFIG_I7300_IDLE=m
##
CONFIG_IIO=m
CONFIG_IIO_BUFFER=y
-#. These will be selected by drivers that need them
-# CONFIG_IIO_BUFFER_CB is not set
-# CONFIG_IIO_KFIFO_BUF is not set
# CONFIG_IIO_TRIGGER is not set
##
@@ -890,6 +886,13 @@ CONFIG_VIPERBOARD_ADC=m
# CONFIG_AD8366 is not set
##
+## file: drivers/iio/buffer/Kconfig
+##
+#. These will be selected by drivers that need them
+# CONFIG_IIO_BUFFER_CB is not set
+# CONFIG_IIO_KFIFO_BUF is not set
+
+##
## file: drivers/iio/common/ssp_sensors/Kconfig
##
# CONFIG_IIO_SSP_SENSORHUB is not set
@@ -2308,11 +2311,6 @@ CONFIG_SDIO_UART=m
# CONFIG_MMC_TEST is not set
##
-## file: drivers/mmc/core/Kconfig
-##
-# CONFIG_MMC_CLKGATE is not set
-
-##
## file: drivers/mmc/host/Kconfig
##
CONFIG_MMC_SDHCI=m
@@ -2670,11 +2668,6 @@ CONFIG_BE2NET_VXLAN=y
CONFIG_NET_VENDOR_I825XX=y
##
-## file: drivers/net/ethernet/icplus/Kconfig
-##
-CONFIG_IP1000=m
-
-##
## file: drivers/net/ethernet/intel/Kconfig
##
CONFIG_NET_VENDOR_INTEL=y
@@ -3159,7 +3152,6 @@ CONFIG_WIL6210_TRACING=y
## file: drivers/net/wireless/b43/Kconfig
##
CONFIG_B43=m
-CONFIG_B43_PCMCIA=y
CONFIG_B43_SDIO=y
CONFIG_B43_PHY_G=y
CONFIG_B43_PHY_N=y
@@ -3273,6 +3265,27 @@ CONFIG_P54_PCI=m
# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
##
+## file: drivers/net/wireless/realtek/rtl818x/Kconfig
+##
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+
+##
+## file: drivers/net/wireless/realtek/rtlwifi/Kconfig
+##
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+# CONFIG_RTLWIFI_DEBUG is not set
+
+##
## file: drivers/net/wireless/rsi/Kconfig
##
CONFIG_RSI_91X=m
@@ -3304,27 +3317,6 @@ CONFIG_RT2800USB_RT55XX=y
# CONFIG_RT2X00_DEBUG is not set
##
-## file: drivers/net/wireless/rtl818x/Kconfig
-##
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-
-##
-## file: drivers/net/wireless/rtlwifi/Kconfig
-##
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8821AE=m
-CONFIG_RTL8192CU=m
-# CONFIG_RTLWIFI_DEBUG is not set
-
-##
## file: drivers/net/wireless/ti/Kconfig
##
# CONFIG_WL_TI is not set
@@ -3346,7 +3338,8 @@ CONFIG_NFC_PORT100=m
##
## file: drivers/nfc/microread/Kconfig
##
-# CONFIG_NFC_MICROREAD is not set
+# CONFIG_NFC_MICROREAD_I2C is not set
+# CONFIG_NFC_MICROREAD_MEI is not set
##
## file: drivers/nfc/st21nfca/Kconfig
@@ -3354,6 +3347,11 @@ CONFIG_NFC_PORT100=m
# CONFIG_NFC_ST21NFCA is not set
##
+## file: drivers/nvme/host/Kconfig
+##
+CONFIG_BLK_DEV_NVME=m
+
+##
## file: drivers/of/Kconfig
##
# CONFIG_OF_OVERLAY is not set
@@ -3476,7 +3474,7 @@ CONFIG_WM8350_POWER=m
# CONFIG_BATTERY_DS2780 is not set
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_BQ27XXX is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
CONFIG_CHARGER_PCF50633=m
@@ -3755,18 +3753,12 @@ CONFIG_SCSI_SAS_HOST_SMP=y
CONFIG_MEGARAID_SAS=m
##
-## file: drivers/scsi/mpt2sas/Kconfig
-##
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-# CONFIG_SCSI_MPT2SAS_LOGGING is not set
-
-##
## file: drivers/scsi/mpt3sas/Kconfig
##
CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-# CONFIG_SCSI_MPT3SAS_LOGGING is not set
+CONFIG_SCSI_MPT2SAS=m
##
## file: drivers/scsi/mvsas/Kconfig
@@ -3843,6 +3835,7 @@ CONFIG_SPI_LM70_LLP=m
## file: drivers/ssb/Kconfig
##
CONFIG_SSB=m
+CONFIG_SSB_PCMCIAHOST=y
# CONFIG_SSB_SILENT is not set
# CONFIG_SSB_DEBUG is not set
# CONFIG_SSB_DRIVER_GPIO is not set
@@ -3868,11 +3861,6 @@ CONFIG_STAGING=y
# CONFIG_DGNC is not set
##
-## file: drivers/staging/ft1000/Kconfig
-##
-# CONFIG_FT1000 is not set
-
-##
## file: drivers/staging/gdm724x/Kconfig
##
# CONFIG_LTE_GDM724X is not set
@@ -4291,7 +4279,6 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_ISP116X_HCD is not set
# CONFIG_USB_ISP1362_HCD is not set
-# CONFIG_USB_FUSBH200_HCD is not set
# CONFIG_USB_FOTG210_HCD is not set
# CONFIG_USB_MAX3421_HCD is not set
CONFIG_USB_OHCI_HCD_PCI=y
@@ -5962,7 +5949,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_CT_NETLINK=m
CONFIG_NF_CT_NETLINK_TIMEOUT=y
CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_INET=m
CONFIG_NFT_EXTHDR=m
diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64
index bd0db3a..bf20fc4 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64
+++ b/debian/config/kernelarch-powerpc/config-arch-64
@@ -30,7 +30,6 @@ CONFIG_IBMEBUS=y
## file: arch/powerpc/platforms/Kconfig.cputype
##
CONFIG_PPC64=y
-# CONFIG_TUNE_CELL is not set
CONFIG_ALTIVEC=y
CONFIG_VSX=y
CONFIG_SMP=y
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index c913335..99e4663 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -37,7 +37,6 @@ CONFIG_I8K=m
CONFIG_MICROCODE=y
CONFIG_MICROCODE_INTEL=y
CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_EARLY=y
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
CONFIG_NODES_SHIFT=6
@@ -462,9 +461,9 @@ CONFIG_EFI_RUNTIME_MAP=y
## file: drivers/gpio/Kconfig
##
CONFIG_GPIOLIB=y
-# CONFIG_GPIO_F7188X is not set
# CONFIG_GPIO_ICH is not set
# CONFIG_GPIO_LYNXPOINT is not set
+# CONFIG_GPIO_F7188X is not set
# CONFIG_GPIO_SCH is not set
CONFIG_GPIO_KEMPLD=m
# CONFIG_GPIO_INTEL_MID is not set
@@ -1229,7 +1228,6 @@ CONFIG_NFC_MEI_PHY=m
##
## file: drivers/nfc/pn544/Kconfig
##
-CONFIG_NFC_PN544=m
CONFIG_NFC_PN544_MEI=m
##
@@ -1429,7 +1427,6 @@ CONFIG_COMEDI_PARPORT=m
CONFIG_COMEDI_SERIAL2002=m
CONFIG_COMEDI_SSV_DNP=m
# CONFIG_COMEDI_ISA_DRIVERS is not set
-CONFIG_COMEDI_UNIOXX5=m
CONFIG_COMEDI_II_PCI20KC=m
CONFIG_COMEDI_S526=m
CONFIG_COMEDI_PCI_DRIVERS=y
--
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