diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:24:14 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:24:14 +0100 |
| commit | f7733363e6625437f4d42faf58d22dfd247a6c77 (patch) | |
| tree | 4c837a761d8e1a6d8489624433edb52944d492fe /drivers/misc/Makefile | |
| parent | 2c69f23b00d63695704fffb24571d7b5bf857403 (diff) | |
| parent | dccf714b737a9e6de759045f32ba07d93ada36e5 (diff) | |
Merge topic branch 'modem' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers/misc/Makefile')
| -rw-r--r-- | drivers/misc/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 25c8efc695d..17c50c1b1d2 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -50,6 +50,11 @@ obj-$(CONFIG_STM_TRACE) += stm.o obj-$(CONFIG_HWMEM) += hwmem/ obj-$(CONFIG_DISPDEV) += dispdev/ obj-$(CONFIG_COMPDEV) += compdev/ +obj-$(CONFIG_STE_TRACE_MODEM) += db8500-modem-trace.o +obj-$(CONFIG_DBX500_MLOADER) += dbx500-mloader.o +obj-$(CONFIG_U5500_MBOX) += mbox.o mbox_channels-db5500.o +obj-$(CONFIG_U8500_SIM_DETECT) += sim_detect.o obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ obj-$(CONFIG_MAX8997_MUIC) += max8997-muic.o +obj-y += modem_audio/ |