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/char/Makefile | |
| parent | 51e8d6a38d035e820d1f9ea539d34cd76e348620 (diff) | |
| parent | 5bf88152dfb4f28f8e2e9a2bf138eb52c87a17e8 (diff) | |
Merge topic branch 'modem' into integration-linux-ux500-3.3
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 32762ba769c..3b82024f70e 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -50,6 +50,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/ |