aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/u8500_snowball_android_defconfig6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/configs/u8500_snowball_android_defconfig b/arch/arm/configs/u8500_snowball_android_defconfig
index c35e93dc39e..80cd09cb55f 100644
--- a/arch/arm/configs/u8500_snowball_android_defconfig
+++ b/arch/arm/configs/u8500_snowball_android_defconfig
@@ -10,8 +10,8 @@ CONFIG_BLK_DEV_INITRD=y
CONFIG_KALLSYMS_ALL=y
CONFIG_ASHMEM=y
CONFIG_EMBEDDED=y
-CONFIG_PERF_EVENTS=y
CONFIG_SLAB=y
+CONFIG_PROFILING=y
CONFIG_BOOTTIME=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
@@ -97,7 +97,6 @@ CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=73728
CONFIG_MISC_DEVICES=y
CONFIG_AB8500_PWM=y
-CONFIG_DISPDEV=y
CONFIG_STM_TRACE=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
@@ -272,11 +271,10 @@ CONFIG_TIMER_STATS=y
CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_INFO=y
CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_FUNCTION_TRACER=y
+CONFIG_ENABLE_DEFAULT_TRACERS=y
CONFIG_DEBUG_USER=y
CONFIG_KEYS=y
CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_TWOFISH=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_DEV_UX500=y