[linux] 02/02: Clean up kconfig using kconfigeditor2
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Thu Apr 20 18:45:28 UTC 2017
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository linux.
commit 0905519af414d339f615d7aac974f9a9163cdbd3
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Thu Apr 20 19:45:06 2017 +0100
Clean up kconfig using kconfigeditor2
Rename or delete options that changed in 4.11.
---
debian/config/arm64/config | 12 ++++++++----
debian/config/armel/config.marvell | 2 +-
debian/config/armhf/config | 8 ++++++--
debian/config/config | 22 ++++++----------------
debian/config/hppa/config | 5 -----
debian/config/kernelarch-x86/config | 7 +------
debian/config/m68k/config | 2 --
debian/config/sh4/config | 1 -
8 files changed, 22 insertions(+), 37 deletions(-)
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 4b6592e..27da448 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -25,11 +25,11 @@ CONFIG_ARM64_CRYPTO=y
CONFIG_CRYPTO_SHA1_ARM64_CE=m
CONFIG_CRYPTO_SHA2_ARM64_CE=m
CONFIG_CRYPTO_GHASH_ARM64_CE=m
+CONFIG_CRYPTO_CRC32_ARM64_CE=y
CONFIG_CRYPTO_AES_ARM64_CE=m
CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
-CONFIG_CRYPTO_CRC32_ARM64=y
##
## file: arch/arm64/kvm/Kconfig
@@ -511,16 +511,20 @@ CONFIG_WLCORE_SDIO=m
CONFIG_QCOM_QFPROM=m
##
+## file: drivers/pci/dwc/Kconfig
+##
+CONFIG_PCI_HISI=y
+CONFIG_PCIE_QCOM=y
+CONFIG_PCIE_ARMADA_8K=y
+
+##
## file: drivers/pci/host/Kconfig
##
CONFIG_PCI_AARDVARK=y
CONFIG_PCI_HOST_GENERIC=y
CONFIG_PCI_XGENE=y
-CONFIG_PCI_HISI=y
-CONFIG_PCIE_QCOM=y
CONFIG_PCI_HOST_THUNDER_PEM=y
CONFIG_PCI_HOST_THUNDER_ECAM=y
-CONFIG_PCIE_ARMADA_8K=y
##
## file: drivers/phy/Kconfig
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index 73dbe6d..5994826 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -706,7 +706,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_FUNCTION_GRAPH_TRACER is not set
# CONFIG_FTRACE_SYSCALLS is not set
# CONFIG_STACK_TRACER is not set
-# CONFIG_UPROBE_EVENT is not set
+# CONFIG_UPROBE_EVENTS is not set
##
## file: lib/Kconfig.debug
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index ce4a684..0b58fd5 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -841,11 +841,15 @@ CONFIG_ROCKCHIP_EFUSE=m
CONFIG_NVMEM_SUNXI_SID=m
##
-## file: drivers/pci/host/Kconfig
+## file: drivers/pci/dwc/Kconfig
##
CONFIG_PCI_DRA7XX=y
-CONFIG_PCI_MVEBU=y
CONFIG_PCI_IMX6=y
+
+##
+## file: drivers/pci/host/Kconfig
+##
+CONFIG_PCI_MVEBU=y
CONFIG_PCI_TEGRA=y
##
diff --git a/debian/config/config b/debian/config/config
index b631c6f..f0cf712 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -11,6 +11,7 @@ CONFIG_JUMP_LABEL=y
CONFIG_CC_STACKPROTECTOR_STRONG=y
## end choice
CONFIG_VMAP_STACK=y
+CONFIG_STRICT_KERNEL_RWX=y
##
## file: block/Kconfig
@@ -431,7 +432,6 @@ CONFIG_PROC_EVENTS=y
##
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
## choice: Default CPUFreq governor
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
@@ -1332,7 +1332,6 @@ CONFIG_KEYBOARD_STOWAWAY=m
# CONFIG_INPUT_BMA150 is not set
# CONFIG_INPUT_E3X0_BUTTON is not set
# CONFIG_INPUT_MMA8450 is not set
-# CONFIG_INPUT_MPU3050 is not set
# CONFIG_INPUT_GP2A is not set
# CONFIG_INPUT_GPIO_BEEPER is not set
# CONFIG_INPUT_GPIO_TILT_POLLED is not set
@@ -2259,7 +2258,6 @@ CONFIG_SMS_USB_DRV=m
## file: drivers/media/usb/stk1160/Kconfig
##
CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160_AC97=y
##
## file: drivers/media/usb/stkwebcam/Kconfig
@@ -3144,12 +3142,6 @@ CONFIG_CASSINI=m
CONFIG_NIU=m
##
-## file: drivers/net/ethernet/synopsys/Kconfig
-##
-CONFIG_NET_VENDOR_SYNOPSYS=y
-# CONFIG_SYNOPSYS_DWC_ETH_QOS is not set
-
-##
## file: drivers/net/ethernet/tehuti/Kconfig
##
CONFIG_NET_VENDOR_TEHUTI=y
@@ -3733,7 +3725,7 @@ CONFIG_PCI_IOV=y
# CONFIG_PCI_PASID is not set
##
-## file: drivers/pci/host/Kconfig
+## file: drivers/pci/dwc/Kconfig
##
# CONFIG_PCIE_DW_PLAT is not set
@@ -4335,7 +4327,6 @@ CONFIG_STAGING=y
## file: drivers/staging/media/lirc/Kconfig
##
# CONFIG_LIRC_STAGING is not set
-# CONFIG_LIRC_PARALLEL is not set
##
## file: drivers/staging/most/Kconfig
@@ -5757,8 +5748,8 @@ CONFIG_BRANCH_PROFILE_NONE=y
## end choice
CONFIG_STACK_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_KPROBE_EVENT=y
-CONFIG_UPROBE_EVENT=y
+CONFIG_KPROBE_EVENTS=y
+CONFIG_UPROBE_EVENTS=y
CONFIG_DYNAMIC_FTRACE=y
# CONFIG_FUNCTION_PROFILER is not set
# CONFIG_FTRACE_STARTUP_TEST is not set
@@ -5834,7 +5825,6 @@ CONFIG_SCHED_DEBUG=y
CONFIG_SCHEDSTATS=y
CONFIG_SCHED_STACK_END_CHECK=y
# CONFIG_DEBUG_TIMEKEEPING is not set
-# CONFIG_TIMER_STATS is not set
CONFIG_DEBUG_PREEMPT=y
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_DEBUG_SPINLOCK is not set
@@ -6620,7 +6610,6 @@ CONFIG_RDS_TCP=m
##
CONFIG_RFKILL=m
CONFIG_RFKILL_INPUT=y
-# CONFIG_RFKILL_REGULATOR is not set
# CONFIG_RFKILL_GPIO is not set
##
@@ -7023,7 +7012,8 @@ CONFIG_SND_PDAUDIOCF=m
# CONFIG_SND_SOC_CS4271_SPI is not set
# CONFIG_SND_SOC_CS42XX8_I2C is not set
# CONFIG_SND_SOC_CS4349 is not set
-# CONFIG_SND_SOC_ES8328 is not set
+# CONFIG_SND_SOC_ES8328_I2C is not set
+# CONFIG_SND_SOC_ES8328_SPI is not set
# CONFIG_SND_SOC_GTM601 is not set
# CONFIG_SND_SOC_PCM1681 is not set
# CONFIG_SND_SOC_PCM179X_I2C is not set
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index 7e9bb10..f7a613e 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -14,11 +14,6 @@ CONFIG_PARISC_PAGE_SIZE_4KB=y
## end choice
##
-## file: arch/parisc/Kconfig.debug
-##
-# CONFIG_DEBUG_RODATA is not set
-
-##
## file: block/partitions/Kconfig
##
# CONFIG_PARTITION_ADVANCED is not set
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index e7ba0de..c799198 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -90,10 +90,7 @@ CONFIG_EARLY_PRINTK=y
CONFIG_EARLY_PRINTK_EFI=y
# CONFIG_X86_PTDUMP is not set
# CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_DEBUG_RODATA_TEST is not set
CONFIG_DEBUG_WX=y
-CONFIG_DEBUG_SET_MODULE_RONX=y
-# CONFIG_DEBUG_NX_TEST is not set
CONFIG_DOUBLEFAULT=y
# CONFIG_DEBUG_TLBFLUSH is not set
# CONFIG_IOMMU_DEBUG is not set
@@ -1349,7 +1346,6 @@ CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
CONFIG_ALIENWARE_WMI=m
CONFIG_ASUS_LAPTOP=m
-CONFIG_DELL_SMBIOS=m
CONFIG_DELL_LAPTOP=m
CONFIG_DELL_WMI=m
CONFIG_DELL_WMI_AIO=m
@@ -1599,8 +1595,6 @@ CONFIG_STAGING_MEDIA=y
## file: drivers/staging/media/lirc/Kconfig
##
CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_BT829=m
-CONFIG_LIRC_IMON=m
CONFIG_LIRC_SASEM=m
CONFIG_LIRC_SIR=m
CONFIG_LIRC_ZILOG=m
@@ -1905,6 +1899,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
## file: mm/Kconfig.debug
##
# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_RODATA_TEST is not set
##
## file: net/ax25/Kconfig
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index 2c49fd7..d5ff571 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -304,7 +304,6 @@ CONFIG_SERIO_LIBPS2=y
##
CONFIG_ADB=y
CONFIG_ADB_MACII=y
-# CONFIG_ADB_MACIISI is not set
#. switched on for the benefit of IIfx, Q900, Q950
CONFIG_ADB_IOP=y
CONFIG_ADB_PMU68K=y
@@ -738,7 +737,6 @@ CONFIG_HZ_PERIODIC=y
# CONFIG_DEBUG_FS is not set
# CONFIG_FRAME_POINTER is not set
# CONFIG_SCHED_DEBUG is not set
-# CONFIG_TIMER_STATS is not set
##
## file: mm/Kconfig
diff --git a/debian/config/sh4/config b/debian/config/sh4/config
index 25694da..adaf675 100644
--- a/debian/config/sh4/config
+++ b/debian/config/sh4/config
@@ -36,7 +36,6 @@ CONFIG_CACHE_WRITEBACK=y
##
## file: drivers/cpufreq/Kconfig
##
-CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_SH_CPU_FREQ=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