summaryrefslogtreecommitdiff
path: root/include/linux/Kbuild
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-05-22 16:07:23 -0400
committerDavid S. Miller <davem@davemloft.net>2012-05-22 16:07:23 -0400
commitc3719a1ef52eb1aadf77b7557cc9ca08124d8818 (patch)
tree9fc3737751948a71cde8f8ff64d1ca4cb0f44932 /include/linux/Kbuild
parent35c579070a349cfe54f9e09a47df2c5b68d58469 (diff)
parenta0d0d1685f9763ab26a394df3ab84026b39a06a7 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John says: -------------------- I apologize for not having sent this sooner. FWIW, I was in a car somewhere between Illinois and North Carolina for most of the day Sunday and Monday... :-) This is (obviously) the last non-fix pull request for wireless bits intended for 3.5. It includes AP support for mwifiex, a variety of HCI and other updates for NFC, some brcmfmac and brcmsmac refactoring, a large batch of ssb and bcma updates, a batch of ath6kl updates, some cfg80211 and mac80211 updates/refactoring from Johannes Berg, a rather large collection of Bluetooth updates by way of Gustavo, and a variety of other bits here and there. -------------------- Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/Kbuild')
-rw-r--r--include/linux/Kbuild1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 0237b84ba541..233f4239c479 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -269,6 +269,7 @@ header-y += netfilter_ipv4.h
header-y += netfilter_ipv6.h
header-y += netlink.h
header-y += netrom.h
+header-y += nfc.h
header-y += nfs.h
header-y += nfs2.h
header-y += nfs3.h