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:55:54 +0100 |
| commit | 0809ba1e0b33b034ad43f559f57c22fcc87920bd (patch) | |
| tree | e7c6d48cc9540f6580c3d298cd8a49425e3d0db7 | |
| parent | f99602d0c458d0adc9841d8511e0787d8026d039 (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 | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/configs/u8500_android_defconfig b/arch/arm/configs/u8500_android_defconfig index c5ed034a99e..3a1262379fe 100644 --- a/arch/arm/configs/u8500_android_defconfig +++ b/arch/arm/configs/u8500_android_defconfig @@ -128,7 +128,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 f239e146aad..300152899c7 100755 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -112,8 +112,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 |