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/net/Makefile | |
| parent | 51e8d6a38d035e820d1f9ea539d34cd76e348620 (diff) | |
| parent | 5bf88152dfb4f28f8e2e9a2bf138eb52c87a17e8 (diff) | |
Merge topic branch 'modem' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index a6b8ce11a22..a0f2484368b 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -70,3 +70,8 @@ obj-$(CONFIG_USB_IPHETH) += usb/ obj-$(CONFIG_USB_CDC_PHONET) += usb/ obj-$(CONFIG_HYPERV_NET) += hyperv/ + +ifdef CONFIG_PHONET +obj-$(CONFIG_U8500_SHRM) += u8500_shrm.o +obj-$(CONFIG_MODEM_M6718_SPI) += m6718_modem_net.o +endif |