summaryrefslogtreecommitdiff
path: root/backport
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-04-15 13:37:21 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-04-15 13:38:45 +0200
commitb8801f559db82b5752f32dbc4a6eb575dfdbc9b6 (patch)
tree2f02c7cee198d377704c899346f873916300d7b4 /backport
parent8bdcff47381eaea535f46e021221c4064522fe89 (diff)
backports: fix rndis-wlan usb dependencies
I included that file always, but then when the copy-list doesn't contain the drivers/net/usb/ directory it would fail to build ... fix that by including that directory only conditionally when USB_NET_RNDIS_WLAN is selected. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'backport')
-rw-r--r--backport/Makefile.kernel2
1 files changed, 1 insertions, 1 deletions
diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel
index 2f80cc8e..5f465597 100644
--- a/backport/Makefile.kernel
+++ b/backport/Makefile.kernel
@@ -29,7 +29,7 @@ obj-$(CPTCFG_BT) += drivers/bluetooth/
obj-$(CPTCFG_SSB) += drivers/ssb/
obj-$(CPTCFG_BCMA) += drivers/bcma/
obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/
-obj-m += drivers/net/usb/
+obj-$(CTPCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/
obj-$(CPTCFG_DRM) += drivers/gpu/drm/
obj-$(CPTCFG_NFC) += net/nfc/
obj-$(CPTCFG_NFC) += drivers/nfc/