build: enable NFC build

Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/backport/Kconfig b/backport/Kconfig
index 8a38d610c896b7e08be77b66f560de8a42cc2783..6ab099194197f8baaf7f05e78ad697f701e949fd 100644 (file)
--- a/backport/Kconfig
+++ b/backport/Kconfig
@@ -36,3 +36,5 @@ source drivers/ssb/Kconfig
 source drivers/bcma/Kconfig
 
 source drivers/gpu/drm/Kconfig
+
+source net/nfc/Kconfig

diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel
index 8aa3e4a111e0b51847f9ee1352261e77e05e13c7..4d00bda6f1347b4812c727e5ccfa489b70f2f5da 100644 (file)
--- a/backport/Makefile.kernel
+++ b/backport/Makefile.kernel
@@ -23,3 +23,5 @@ obj-$(CPTCFG_SSB) += drivers/ssb/
 obj-$(CPTCFG_BCMA) += drivers/bcma/
 obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/
 obj-$(CPTCFG_DRM) += drivers/gpu/drm/
+obj-$(CPTCFG_NFC) += net/nfc/
+obj-$(CPTCFG_NFC) += drivers/nfc/

diff --git a/dependencies b/dependencies
index 7c794492fcfbdd71f47fa778f935dfeb1f0f4e7a..e9aaa2eea0aac14b986588c6f8d168ece1befcca 100644 (file)
--- a/dependencies
+++ b/dependencies
@@ -83,3 +83,7 @@ BRCMDBG 2.6.30
 # backport it, but I can't test that and this is a
 # lot easier right now.
 BT_HIDP 2.6.33
+
+# NFC core needs PF_NFC defined in socket.h which was
+# only introduced in kernel 3.1
+NFC 3.1