summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2012-03-20 14:36:00 +0100
committerPhilippe Langlais <philippe.langlais@linaro.org>2012-03-20 14:52:37 +0100
commit0744ecc1282fdeb3fba0d5e7ec61c43f56f2e742 (patch)
tree55999f6ce9bace0bea6c30d9d7a226888fdb7fcc
parentf95cee0959085bd0a891bce2ab59dc37abb15951 (diff)
configs: Temporary disable STM traces for Snowball
There are conflicts with Snowball GPIOs Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
-rwxr-xr-xarch/arm/configs/u8500_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 16fc7d572a4..7a151c5cd15 100755
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -10,8 +10,8 @@ CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_KALLSYMS_ALL=y
CONFIG_EMBEDDED=y
-CONFIG_PERF_EVENTS=y
CONFIG_SLAB=y
+CONFIG_PROFILING=y
CONFIG_BOOTTIME=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
@@ -117,7 +117,6 @@ CONFIG_SENSORS_BH1780=y
CONFIG_STE_TRACE_MODEM=y
CONFIG_DISPDEV=y
CONFIG_U8500_SIM_DETECT=y
-CONFIG_STM_TRACE=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_MD=y