[linux] 04/04: Rename, move or delete obsolete Kconfig definitions as appropriate
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sun Sep 27 18:23: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 297b345f7c0840114ca911cf1c1f7f5bddca00d2
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Sun Sep 27 19:15:51 2015 +0100
Rename, move or delete obsolete Kconfig definitions as appropriate
---
debian/config/arm64/config | 9 ++--
debian/config/armhf/config.armmp | 28 +++++-----
debian/config/config | 62 ++++++++--------------
debian/config/kernelarch-mips/config.loongson-2f | 6 +--
debian/config/kernelarch-powerpc/config-arch-64-be | 1 -
debian/config/kernelarch-x86/config | 8 +--
debian/config/kernelarch-x86/config-arch-32 | 2 +-
7 files changed, 49 insertions(+), 67 deletions(-)
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index cc33496..e8f38a1 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -1,10 +1,7 @@
##
## file: arch/arm64/Kconfig
##
-CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARCH_XGENE=y
CONFIG_PCI=y
-CONFIG_SMP=y
CONFIG_XEN=y
CONFIG_COMPAT=y
@@ -21,6 +18,12 @@ CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
##
+## file: arch/arm64/Kconfig.platforms
+##
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARCH_XGENE=y
+
+##
## file: drivers/ata/Kconfig
##
CONFIG_AHCI_XGENE=m
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index 0d1e51d..527580d 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -174,7 +174,7 @@ CONFIG_CPUFREQ_DT=m
## file: drivers/cpufreq/Kconfig.arm
##
CONFIG_ARM_IMX6Q_CPUFREQ=m
-CONFIG_ARM_TEGRA_CPUFREQ=y
+CONFIG_ARM_TEGRA20_CPUFREQ=y
##
## file: drivers/crypto/Kconfig
@@ -188,16 +188,16 @@ CONFIG_CRYPTO_DEV_OMAP_AES=m
##
CONFIG_DMADEVICES=y
CONFIG_AMBA_PL08X=y
-CONFIG_MV_XOR=y
-CONFIG_TEGRA20_APB_DMA=y
-CONFIG_TI_EDMA=y
-CONFIG_PL330_DMA=y
-CONFIG_IMX_SDMA=y
+CONFIG_DMA_OMAP=y
+CONFIG_DMA_SUN6I=m
CONFIG_IMX_DMA=y
+CONFIG_IMX_SDMA=y
+CONFIG_MV_XOR=y
CONFIG_MXS_DMA=y
-CONFIG_DMA_OMAP=y
+CONFIG_PL330_DMA=y
+CONFIG_TEGRA20_APB_DMA=y
CONFIG_TI_CPPI41=m
-CONFIG_DMA_SUN6I=m
+CONFIG_TI_EDMA=y
##
## file: drivers/extcon/Kconfig
@@ -453,11 +453,6 @@ CONFIG_TWL6040_CORE=y
CONFIG_ARM_CHARLCD=y
##
-## file: drivers/misc/eeprom/Kconfig
-##
-CONFIG_EEPROM_SUNXI_SID=m
-
-##
## file: drivers/misc/ti-st/Kconfig
##
CONFIG_TI_ST=m
@@ -670,6 +665,11 @@ CONFIG_WLCORE_SPI=m
CONFIG_WLCORE_SDIO=m
##
+## file: drivers/nvmem/Kconfig
+##
+CONFIG_NVMEM_SUNXI_SID=m
+
+##
## file: drivers/pci/host/Kconfig
##
CONFIG_PCI_MVEBU=y
@@ -910,9 +910,7 @@ CONFIG_USB_MUSB_TUSB6010=m
CONFIG_USB_MUSB_OMAP2PLUS=m
CONFIG_USB_MUSB_AM35X=m
CONFIG_USB_MUSB_DSPS=m
-## choice: MUSB DMA mode
CONFIG_MUSB_PIO_ONLY=y
-## end choice
##
## file: drivers/usb/phy/Kconfig
diff --git a/debian/config/config b/debian/config/config
index 53c5d11..1ebb0e8 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -55,6 +55,11 @@ CONFIG_EFI_PARTITION=y
# CONFIG_CMDLINE_PARTITION is not set
##
+## file: certs/Kconfig
+##
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
+
+##
## file: crypto/Kconfig
##
CONFIG_CRYPTO=y
@@ -438,7 +443,6 @@ CONFIG_ASYNC_TX_DMA=y
## file: drivers/edac/Kconfig
##
CONFIG_EDAC_LEGACY_SYSFS=y
-# CONFIG_EDAC_MCE_INJ is not set
##
## file: drivers/extcon/Kconfig
@@ -502,6 +506,7 @@ CONFIG_GPIO_VIPERBOARD=m
##
## file: drivers/gpu/drm/Kconfig
##
+CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_VIA=m
CONFIG_DRM_SAVAGE=m
@@ -520,7 +525,7 @@ CONFIG_DRM_BOCHS=m
##
## file: drivers/gpu/drm/bridge/Kconfig
##
-# CONFIG_DRM_PTN3460 is not set
+# CONFIG_DRM_NXP_PTN3460 is not set
##
## file: drivers/gpu/drm/cirrus/Kconfig
@@ -842,8 +847,8 @@ CONFIG_IIO_BUFFER=y
CONFIG_HID_SENSOR_ACCEL_3D=m
# CONFIG_IIO_ST_ACCEL_3AXIS is not set
# CONFIG_KXSD9 is not set
-# CONFIG_MMA8452 is not set
# CONFIG_KXCJK1013 is not set
+# CONFIG_MMA8452 is not set
# CONFIG_MMA9551 is not set
# CONFIG_MMA9553 is not set
@@ -1013,12 +1018,6 @@ CONFIG_INFINIBAND_USER_MAD=m
CONFIG_INFINIBAND_USER_ACCESS=m
##
-## file: drivers/infiniband/hw/amso1100/Kconfig
-##
-CONFIG_INFINIBAND_AMSO1100=m
-# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
-
-##
## file: drivers/infiniband/hw/cxgb3/Kconfig
##
CONFIG_INFINIBAND_CXGB3=m
@@ -1030,11 +1029,6 @@ CONFIG_INFINIBAND_CXGB3=m
CONFIG_INFINIBAND_CXGB4=m
##
-## file: drivers/infiniband/hw/ipath/Kconfig
-##
-CONFIG_INFINIBAND_IPATH=m
-
-##
## file: drivers/infiniband/hw/mlx4/Kconfig
##
CONFIG_MLX4_INFINIBAND=m
@@ -2366,7 +2360,8 @@ CONFIG_MTD_PLATRAM=m
##
# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND_ECC_BCH=y
-# CONFIG_MTD_NAND_DENALI is not set
+# CONFIG_MTD_NAND_DENALI_PCI is not set
+# CONFIG_MTD_NAND_DENALI_DT is not set
# CONFIG_MTD_NAND_GPIO is not set
CONFIG_MTD_NAND_RICOH=m
# CONFIG_MTD_NAND_DOCG4 is not set
@@ -3951,14 +3946,20 @@ CONFIG_STAGING=y
# CONFIG_MTD_SPINAND_MT29F is not set
##
-## file: drivers/staging/ozwpan/Kconfig
+## file: drivers/staging/panel/Kconfig
##
-# CONFIG_USB_WPAN_HCD is not set
+# CONFIG_PANEL is not set
##
-## file: drivers/staging/panel/Kconfig
+## file: drivers/staging/rdma/amso1100/Kconfig
##
-# CONFIG_PANEL is not set
+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
@@ -4007,11 +4008,6 @@ CONFIG_R8712U=m
# CONFIG_FB_SM750 is not set
##
-## file: drivers/staging/sm7xxfb/Kconfig
-##
-# CONFIG_FB_SM7XX is not set
-
-##
## file: drivers/staging/speakup/Kconfig
##
CONFIG_SPEAKUP=m
@@ -4502,6 +4498,7 @@ CONFIG_FB_MB862XX_PCI_GDC=y
CONFIG_FB_MB862XX_I2C=y
# CONFIG_FB_BROADSHEET is not set
# CONFIG_FB_AUO_K190X is not set
+# CONFIG_FB_SM712 is not set
##
## file: drivers/video/fbdev/exynos/Kconfig
@@ -4754,15 +4751,11 @@ CONFIG_EXOFS_FS=m
# CONFIG_EXT2_FS is not set
##
-## file: fs/ext3/Kconfig
-##
-# CONFIG_EXT3_FS is not set
-
-##
## file: fs/ext4/Kconfig
##
+# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=m
-CONFIG_EXT4_USE_FOR_EXT23=y
+CONFIG_EXT4_USE_FOR_EXT2=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
# CONFIG_EXT4_DEBUG is not set
@@ -4835,11 +4828,6 @@ CONFIG_JOLIET=y
CONFIG_ZISOFS=y
##
-## file: fs/jbd/Kconfig
-##
-# CONFIG_JBD_DEBUG is not set
-
-##
## file: fs/jbd2/Kconfig
##
# CONFIG_JBD2_DEBUG is not set
@@ -5238,7 +5226,6 @@ CONFIG_SLAB=y
# CONFIG_SLOB is not set
## end choice
# CONFIG_MMAP_ALLOW_UNINITIALIZED is not set
-# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
CONFIG_PROFILING=y
CONFIG_MODULES=y
CONFIG_MODULE_FORCE_LOAD=y
@@ -5392,7 +5379,6 @@ CONFIG_SCHED_DEBUG=y
# CONFIG_DEBUG_TIMEKEEPING is not set
CONFIG_TIMER_STATS=y
# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
@@ -5412,7 +5398,6 @@ CONFIG_DEBUG_LIST=y
# CONFIG_SPARSE_RCU_POINTER is not set
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=21
-# CONFIG_RCU_CPU_STALL_INFO is not set
# CONFIG_RCU_TRACE is not set
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
@@ -6346,7 +6331,6 @@ CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
## file: security/yama/Kconfig
##
CONFIG_SECURITY_YAMA=y
-CONFIG_SECURITY_YAMA_STACKED=y
##
## file: sound/Kconfig
diff --git a/debian/config/kernelarch-mips/config.loongson-2f b/debian/config/kernelarch-mips/config.loongson-2f
index ed919ce..2f44709 100644
--- a/debian/config/kernelarch-mips/config.loongson-2f
+++ b/debian/config/kernelarch-mips/config.loongson-2f
@@ -75,11 +75,6 @@ CONFIG_RTC_DRV_CMOS=y
# CONFIG_SCSI_LPFC is not set
##
-## file: drivers/staging/sm7xxfb/Kconfig
-##
-CONFIG_FB_SM7XX=y
-
-##
## file: drivers/tty/Kconfig
##
CONFIG_VT=y
@@ -130,6 +125,7 @@ CONFIG_FB=y
CONFIG_FB_SIS=y
CONFIG_FB_SIS_300=y
CONFIG_FB_SIS_315=y
+CONFIG_FB_SM712=y
##
## file: sound/pci/Kconfig
diff --git a/debian/config/kernelarch-powerpc/config-arch-64-be b/debian/config/kernelarch-powerpc/config-arch-64-be
index 858175f..71259df 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64-be
+++ b/debian/config/kernelarch-powerpc/config-arch-64-be
@@ -8,7 +8,6 @@ CONFIG_CMDLINE="console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0"
##
CONFIG_PPC_IBM_CELL_BLADE=y
CONFIG_SPU_FS=m
-CONFIG_SPU_FS_64K_LS=y
CONFIG_CBE_RAS=y
CONFIG_CBE_THERM=m
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index e4df259..3586a4e 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -117,6 +117,11 @@ CONFIG_KVM_AMD=m
CONFIG_KVM_DEVICE_ASSIGNMENT=y
##
+## file: arch/x86/ras/Kconfig
+##
+# CONFIG_AMD_MCE_INJ is not set
+
+##
## file: arch/x86/xen/Kconfig
##
CONFIG_XEN=y
@@ -498,8 +503,6 @@ CONFIG_DRM_I2C_SIL164=m
## file: drivers/gpu/drm/i915/Kconfig
##
CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=y
-CONFIG_DRM_I915_FBDEV=y
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
##
@@ -1970,7 +1973,6 @@ CONFIG_SND_SOC=m
##
## file: sound/soc/intel/Kconfig
##
-CONFIG_SND_SOC_INTEL_SST=m
CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m
CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32
index fc4dedc..2f07a69 100644
--- a/debian/config/kernelarch-x86/config-arch-32
+++ b/debian/config/kernelarch-x86/config-arch-32
@@ -5,7 +5,7 @@
CONFIG_SMP=y
CONFIG_X86_BIGSMP=y
CONFIG_NR_CPUS=32
-# CONFIG_VM86 is not set
+# CONFIG_X86_LEGACY_VM86 is not set
CONFIG_TOSHIBA=m
CONFIG_X86_REBOOTFIXUPS=y
## choice: High Memory Support
--
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