diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:34 +0200 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:34 +0200 |
commit | e1076f2b6e3e1a8631060238f32c5deb2e37b655 (patch) | |
tree | 29b385c6ad57f83d968f1155bacc621355395ac3 /drivers/misc/Makefile | |
parent | 51e8d6a38d035e820d1f9ea539d34cd76e348620 (diff) | |
parent | 5bf88152dfb4f28f8e2e9a2bf138eb52c87a17e8 (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 2741a01610f..fc02851cbe8 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -51,6 +51,11 @@ obj-$(CONFIG_HWMEM) += hwmem/ obj-$(CONFIG_DISPDEV) += dispdev/ obj-$(CONFIG_COMPDEV) += compdev/ obj-$(CONFIG_CLONEDEV) += clonedev/ +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/ |