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/char/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/char/Makefile')
| -rw-r--r-- | drivers/char/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 0dc5d7ce486..a73e2c197cd 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -49,6 +49,11 @@ obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o obj-$(CONFIG_GPIO_TB0219) += tb0219.o obj-$(CONFIG_TELCLOCK) += tlclk.o +ifdef CONFIG_PHONET +obj-$(CONFIG_U8500_SHRM) += shrm_char.o +obj-$(CONFIG_MODEM_M6718_SPI) += m6718_modem_char.o +endif + obj-$(CONFIG_MWAVE) += mwave/ obj-$(CONFIG_AGP) += agp/ obj-$(CONFIG_PCMCIA) += pcmcia/ |