diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-20 14:36:00 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-20 14:50:29 +0100 |
| commit | 83b874a2f7be364731e3a18dbb9ce9fce574739d (patch) | |
| tree | a2b5ff8661f7c0832f42ec7b9d1335a10c75461e | |
| parent | bf55122de366dfe3f34577aab30ab554bb8b6b24 (diff) | |
configs: Temporary disable STM traces for Snowball
There are conflicts with Snowball GPIOs
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | arch/arm/configs/u8500_android_defconfig | 1 | ||||
| -rwxr-xr-x | arch/arm/configs/u8500_defconfig | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/configs/u8500_android_defconfig b/arch/arm/configs/u8500_android_defconfig index 5377711be1c..9c15fa25774 100644 --- a/arch/arm/configs/u8500_android_defconfig +++ b/arch/arm/configs/u8500_android_defconfig @@ -126,7 +126,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 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 |