diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:20 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:20 +0200 |
| commit | 36cee0c070a631eb744aff33916dba0d8c92d3d6 (patch) | |
| tree | 707bca58e7bf89a8f1883a8726f0c8c08ec9da11 /drivers/misc/Makefile | |
| parent | 609cbf05e36abcc92b1e60749b8dd0dc420144fa (diff) | |
| parent | e2673ac489a6fd2f8c4016b1a617f708efb21cc2 (diff) | |
Merge topic branch 'trace-debug' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers/misc/Makefile')
| -rw-r--r-- | drivers/misc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
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 |