summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-11-17 15:32:50 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:03:24 +0200
commit307e81118fc26c8e01f54af4a0fd184a619c1bd8 (patch)
tree0204c04636a862e2eef48c4ab219df5f46f6159f
parentfb79b11cc32ec8024d8fd34ba412d5d01f0a96e1 (diff)
misc: stm: Compile System Trace Module misc driver
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
-rw-r--r--drivers/misc/Kconfig1
-rw-r--r--drivers/misc/Makefile1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index c7795096d43..7b7fc5c7489 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -498,6 +498,7 @@ config MAX8997_MUIC
Maxim MAX8997 PMIC.
The MAX8997 MUIC is a USB port accessory detector and switch.
+source "drivers/misc/Kconfig.stm"
source "drivers/misc/c2port/Kconfig"
source "drivers/misc/eeprom/Kconfig"
source "drivers/misc/cb710/Kconfig"
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 3e1d80106f0..90f219db507 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -46,6 +46,7 @@ obj-y += ti-st/
obj-$(CONFIG_AB8500_PWM) += ab8500-pwm.o
obj-y += lis3lv02d/
obj-y += carma/
+obj-$(CONFIG_STM_TRACE) += stm.o
obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/
obj-$(CONFIG_MAX8997_MUIC) += max8997-muic.o