summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorPierre Peiffer <pierre.peiffer@stericsson.com>2011-09-28 10:35:21 +0200
committerJonas ABERG <jonas.aberg@stericsson.com>2011-10-03 08:07:41 +0200
commit7875f29dff625d03ab881d4d8a94649d4fa9a28d (patch)
tree737eb0d1b961f1f647721d92ec7c0b07faa07498 /arch/arm
parent78114a2c82f40fab85a104eeebb40f67c9493b25 (diff)
U8500: enable again the STM trace driver
This driver has been disabled because of some updates required on user side. Now that the user lib are fixed, enable it again. ST-Ericsson ID: 363600 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: - Signed-off-by: Pierre Peiffer <pierre.peiffer@stericsson.com> Depends-On: I38a2d1ffff4def425d50564de689fb949fe5d6e7, Ib303ad17367e11921471b4124563239d6c26223a, Iad3a2e06c252e4c9dcb323ae3d6a5d51bac579ef Change-Id: I458d4565a5d1dedf84fbbc0c614daf80a9810693 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32438 Reviewed-by: Pierre PEIFFER <pierre.peiffer@stericsson.com> Tested-by: Pierre PEIFFER <pierre.peiffer@stericsson.com>
Diffstat (limited to 'arch/arm')
-rwxr-xr-xarch/arm/configs/u8500_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 5d0b35cdeb6..52166d610a4 100755
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -161,7 +161,7 @@ CONFIG_AB8500_PWM=y
CONFIG_SENSORS_BH1780=y
CONFIG_STE_TRACE_MODEM=y
CONFIG_U8500_SIM_DETECT=y
-# CONFIG_STM_TRACE=y
+CONFIG_STM_TRACE=y
CONFIG_DISPDEV=y
# CONFIG_STE_AUDIO_IO_DEV is not set
CONFIG_SCSI=y