diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:28 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:28 +0800 |
| commit | bb0405fc134f29b78bf52ffe7f3ea2a3678523b5 (patch) | |
| tree | 16d9cb01e6450e97465d8ba4fb4f0adf46736123 /drivers/misc/Makefile | |
| parent | 2e603f2fe80f061c2267e39775c3fbbc242257ae (diff) | |
| parent | 3ce59d85b792eab5a9d7e3e9decc38a014d5c624 (diff) | |
Merge topic branch 'trace-debug' into integration-linux-ux500
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 |