diff options
author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-20 14:36:00 +0100 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:14:59 +0200 |
commit | b651ea84d771b5d30207a36da919c02223b45fa7 (patch) | |
tree | f05f7a4c5958fd19d179af4cb083728b5f1e676a | |
parent | b5fcd54e919104a538958fc46cc54de3d41b10ce (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 | 2 | ||||
-rw-r--r-- | arch/arm/configs/u8500_defconfig | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/configs/u8500_android_defconfig b/arch/arm/configs/u8500_android_defconfig index ff7f2289e1c..058f109f20b 100644 --- a/arch/arm/configs/u8500_android_defconfig +++ b/arch/arm/configs/u8500_android_defconfig @@ -130,8 +130,6 @@ CONFIG_SENSORS_BH1780=y CONFIG_STE_TRACE_MODEM=y CONFIG_DISPDEV=y CONFIG_U8500_SIM_DETECT=y -CONFIG_STM_TRACE=y -CONFIG_STM_DEFAULT_MASTERS_MODES=0x20 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 359619d3ac0..b62e861d6bf 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -120,8 +120,6 @@ CONFIG_SENSORS_BH1780=y CONFIG_STE_TRACE_MODEM=y CONFIG_DISPDEV=y CONFIG_U8500_SIM_DETECT=y -CONFIG_STM_TRACE=y -CONFIG_STM_DEFAULT_MASTERS_MODES=0x20 CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_MD=y |