From b1b2ea1ff1861baac190330f309734c20fa24fb9 Mon Sep 17 00:00:00 2001 From: Steve Muckle Date: Wed, 13 Jun 2012 09:38:58 -0700 Subject: [PATCH] defconfig: automatic update Bringing the defconfigs up to date with the Kconfig files prevents defunct options from appearing to be on or from unrelated changes showing up in future defconfig patches. Signed-off-by: Steve Muckle Change-Id: Icd42aa5a6cb2754e9ddcf6114dfd626d4a8580c8 --- arch/arm/configs/msm7627a-perf_defconfig | 3 +-- arch/arm/configs/msm7627a_defconfig | 3 +-- arch/arm/configs/msm7630-perf_defconfig | 1 - arch/arm/configs/msm7630_defconfig | 1 - arch/arm/configs/msm8660-perf_defconfig | 1 - arch/arm/configs/msm8660_defconfig | 1 - arch/arm/configs/msm8960-perf_defconfig | 4 +--- arch/arm/configs/msm8960_defconfig | 1 - arch/arm/configs/msm9625_defconfig | 6 +----- 9 files changed, 4 insertions(+), 17 deletions(-) diff --git a/arch/arm/configs/msm7627a-perf_defconfig b/arch/arm/configs/msm7627a-perf_defconfig index 447427ab7b8..3cf674de760 100644 --- a/arch/arm/configs/msm7627a-perf_defconfig +++ b/arch/arm/configs/msm7627a-perf_defconfig @@ -237,13 +237,13 @@ CONFIG_VIDEOBUF2_MSM_MEM=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_MSM_CAMERA_V4L2=y CONFIG_OV5647=y -CONFIG_OV8825=y CONFIG_AD5046_ACT=y CONFIG_WEBCAM_OV9726=y CONFIG_MT9E013=y CONFIG_S5K4E1=y CONFIG_DW9712_ACT=y CONFIG_MSM_CAMERA_FLASH_SC628A=y +CONFIG_OV8825=y CONFIG_MSM_CAMERA_SENSOR=y CONFIG_MSM_ACTUATOR=y CONFIG_OV7692=y @@ -339,6 +339,5 @@ CONFIG_DEBUG_INFO=y CONFIG_ENABLE_DEFAULT_TRACERS=y CONFIG_DYNAMIC_DEBUG=y CONFIG_DEBUG_USER=y -CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/msm7627a_defconfig b/arch/arm/configs/msm7627a_defconfig index 639eb105355..000ca736cbd 100644 --- a/arch/arm/configs/msm7627a_defconfig +++ b/arch/arm/configs/msm7627a_defconfig @@ -238,13 +238,13 @@ CONFIG_VIDEOBUF2_MSM_MEM=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_MSM_CAMERA_V4L2=y CONFIG_OV5647=y -CONFIG_OV8825=y CONFIG_AD5046_ACT=y CONFIG_WEBCAM_OV9726=y CONFIG_MT9E013=y CONFIG_S5K4E1=y CONFIG_DW9712_ACT=y CONFIG_MSM_CAMERA_FLASH_SC628A=y +CONFIG_OV8825=y CONFIG_MSM_CAMERA_SENSOR=y CONFIG_MSM_ACTUATOR=y CONFIG_OV7692=y @@ -347,6 +347,5 @@ CONFIG_DEBUG_PAGEALLOC=y CONFIG_ENABLE_DEFAULT_TRACERS=y CONFIG_DYNAMIC_DEBUG=y CONFIG_DEBUG_USER=y -CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRC_CCITT=y diff --git a/arch/arm/configs/msm7630-perf_defconfig b/arch/arm/configs/msm7630-perf_defconfig index c39b4033308..166ff3de478 100644 --- a/arch/arm/configs/msm7630-perf_defconfig +++ b/arch/arm/configs/msm7630-perf_defconfig @@ -370,7 +370,6 @@ CONFIG_TIMER_STATS=y CONFIG_DEBUG_INFO=y CONFIG_DYNAMIC_DEBUG=y CONFIG_DEBUG_USER=y -CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_DEV_QCRYPTO=m CONFIG_CRYPTO_DEV_QCE=m diff --git a/arch/arm/configs/msm7630_defconfig b/arch/arm/configs/msm7630_defconfig index 8dda15fdd59..d795b55d757 100644 --- a/arch/arm/configs/msm7630_defconfig +++ b/arch/arm/configs/msm7630_defconfig @@ -378,7 +378,6 @@ CONFIG_DEBUG_LIST=y CONFIG_DEBUG_PAGEALLOC=y CONFIG_DYNAMIC_DEBUG=y CONFIG_DEBUG_USER=y -CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_DEV_QCRYPTO=m CONFIG_CRYPTO_DEV_QCE=m diff --git a/arch/arm/configs/msm8660-perf_defconfig b/arch/arm/configs/msm8660-perf_defconfig index d5b4007c211..7a7c66623f6 100644 --- a/arch/arm/configs/msm8660-perf_defconfig +++ b/arch/arm/configs/msm8660-perf_defconfig @@ -443,7 +443,6 @@ CONFIG_DEBUG_INFO=y CONFIG_ENABLE_DEFAULT_TRACERS=y CONFIG_DYNAMIC_DEBUG=y CONFIG_DEBUG_USER=y -CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_DEV_QCRYPTO=m CONFIG_CRYPTO_DEV_QCE=m diff --git a/arch/arm/configs/msm8660_defconfig b/arch/arm/configs/msm8660_defconfig index 5e2c1a81a38..2e1c19fb58f 100644 --- a/arch/arm/configs/msm8660_defconfig +++ b/arch/arm/configs/msm8660_defconfig @@ -455,7 +455,6 @@ CONFIG_ENABLE_DEFAULT_TRACERS=y CONFIG_DYNAMIC_DEBUG=y CONFIG_DEBUG_USER=y CONFIG_DEBUG_LL=y -CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_DEV_QCRYPTO=m CONFIG_CRYPTO_DEV_QCE=m diff --git a/arch/arm/configs/msm8960-perf_defconfig b/arch/arm/configs/msm8960-perf_defconfig index 74d31b34414..552903ff82e 100644 --- a/arch/arm/configs/msm8960-perf_defconfig +++ b/arch/arm/configs/msm8960-perf_defconfig @@ -66,7 +66,6 @@ CONFIG_MSM_SMD=y CONFIG_MSM_SMD_PKG4=y CONFIG_MSM_PCIE=y CONFIG_MSM_BAM_DMUX=y -CONFIG_MSM_RMNET_SMUX=y CONFIG_MSM_DSPS=y CONFIG_MSM_IPC_ROUTER=y CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y @@ -259,6 +258,7 @@ CONFIG_DUMMY=y CONFIG_KS8851=m # CONFIG_MSM_RMNET is not set CONFIG_MSM_RMNET_BAM=y +CONFIG_MSM_RMNET_SMUX=y CONFIG_SMC91X=y CONFIG_SMC911X=y CONFIG_SMSC911X=y @@ -308,7 +308,6 @@ CONFIG_ISL9519_CHARGER=y CONFIG_SMB349_CHARGER=y CONFIG_PM8921_CHARGER=y CONFIG_PM8921_BMS=y -CONFIG_PM8921_BCL=y CONFIG_SENSORS_PM8XXX_ADC=y CONFIG_SENSORS_EPM_ADC=y CONFIG_THERMAL=y @@ -475,7 +474,6 @@ CONFIG_ENABLE_DEFAULT_TRACERS=y CONFIG_DYNAMIC_DEBUG=y CONFIG_DEBUG_USER=y CONFIG_PID_IN_CONTEXTIDR=y -CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_DEV_QCRYPTO=m CONFIG_CRYPTO_DEV_QCE=m diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig index 07a3f91239f..8f576d7ac72 100644 --- a/arch/arm/configs/msm8960_defconfig +++ b/arch/arm/configs/msm8960_defconfig @@ -492,7 +492,6 @@ CONFIG_ENABLE_DEFAULT_TRACERS=y CONFIG_DYNAMIC_DEBUG=y CONFIG_DEBUG_USER=y CONFIG_PID_IN_CONTEXTIDR=y -CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_DEV_QCRYPTO=m CONFIG_CRYPTO_DEV_QCE=m diff --git a/arch/arm/configs/msm9625_defconfig b/arch/arm/configs/msm9625_defconfig index 89fb8888f16..62369acab40 100644 --- a/arch/arm/configs/msm9625_defconfig +++ b/arch/arm/configs/msm9625_defconfig @@ -1,7 +1,6 @@ CONFIG_EXPERIMENTAL=y # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SYSVIPC=y -CONFIG_SPARSE_IRQ=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_CGROUPS=y @@ -28,6 +27,7 @@ CONFIG_OPROFILE=m CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_MSM=y CONFIG_ARCH_MSM9625=y # CONFIG_MSM_STACKED_MEMORY is not set @@ -51,7 +51,6 @@ CONFIG_NEON=y # CONFIG_SUSPEND is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y -CONFIG_MISC_DEVICES=y # CONFIG_ANDROID_PMEM is not set # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_KEYBOARD is not set @@ -67,20 +66,17 @@ CONFIG_HW_RANDOM=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set -# CONFIG_MFD_SUPPORT is not set # CONFIG_HID_SUPPORT is not set # CONFIG_USB_SUPPORT is not set CONFIG_VFAT_FS=y CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set -CONFIG_PARTITION_ADVANCED=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ASCII=y CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y # CONFIG_SCHED_DEBUG is not set CONFIG_TIMER_STATS=y # CONFIG_DEBUG_PREEMPT is not set