diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-02-10 13:26:26 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-10 17:41:25 +0100 |
| commit | b1a84039c48ec9f30342e11892a3f2245b165f1b (patch) | |
| tree | c3a89ddbbbedc5af9cdc717eafbf7694013da4d4 | |
| parent | e82690569b0c45639d63dd646aaf24e76e59adf2 (diff) | |
backports: conditionally access net/ieee802154/ with make
This essentially reverts commit cb6f08d3c38c as that caused
issues with copy-list - the scripting when generating the
backport can't prove that net/ieee802154/ isn't needed and
will try to go into it even if it wasn't copied.
Instead, make net/ieee802154/ be entered whenever it might
be needed - which is for CPTCFG_IEEE802154 and CPTCFG_BT.
This is harmless if the directory ends up listed twice but
will cause this problem to disappear.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | backport/Makefile.kernel | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel index 0f5ed6c9..ada6decf 100644 --- a/backport/Makefile.kernel +++ b/backport/Makefile.kernel @@ -34,7 +34,8 @@ obj-$(CPTCFG_NFC) += drivers/nfc/ obj-$(CPTCFG_REGULATOR) += drivers/regulator/ obj-$(CPTCFG_MEDIA_SUPPORT) += drivers/media/ -obj-y += net/ieee802154/ +obj-$(CPTCFG_IEEE802154) += net/ieee802154/ +obj-$(CPTCFG_BT) += net/ieee802154/ obj-$(CPTCFG_MAC802154) += net/mac802154/ obj-$(CPTCFG_IEEE802154) += drivers/net/ieee802154/ |