diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:37 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:37 +0800 |
| commit | d3aeada8de410edd0ea3cb1b73381ebae469c584 (patch) | |
| tree | 8b22bec8a39e599c9250e50ab4078425ca749b35 /drivers/misc/Makefile | |
| parent | 591e5e125f9de0513a732371378eeffe09ef4da5 (diff) | |
| parent | 7338b0ab88d72b11989f40394069164d9326afbf (diff) | |
Merge topic branch 'modem' into integration-linux-ux500
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
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/ |