diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:24:14 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:24:14 +0100 |
| commit | f7733363e6625437f4d42faf58d22dfd247a6c77 (patch) | |
| tree | 4c837a761d8e1a6d8489624433edb52944d492fe /drivers/net/Makefile | |
| parent | 2c69f23b00d63695704fffb24571d7b5bf857403 (diff) | |
| parent | dccf714b737a9e6de759045f32ba07d93ada36e5 (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 |