Unrevert back to backports 20160122.

This reverts commit b531de79d31ac526073ed44838ce2b11dc5ea74d.

Next patch is needed in order to build on gfmn100.

Change-Id: Id45c637e03feb8448f9f6a5d25c9bb0405e75078
diff --git a/drivers/nfc/fdp/Kconfig b/drivers/nfc/fdp/Kconfig
new file mode 100644
index 0000000..8ccc834
--- /dev/null
+++ b/drivers/nfc/fdp/Kconfig
@@ -0,0 +1,27 @@
+config NFC_FDP
+	depends on !KERNEL_3_13
+	tristate "Intel FDP NFC driver"
+	depends on m
+	depends on NFC_NCI
+	depends on CRC_CCITT
+	default n
+	---help---
+	  Intel Fields Peak NFC controller core driver.
+	  This is a driver based on the NCI NFC kernel layers.
+
+	  To compile this driver as a module, choose m here. The module will
+	  be called fdp.
+	  Say N if unsure.
+
+config NFC_FDP_I2C
+	depends on !KERNEL_3_18
+	tristate "NFC FDP i2c support"
+	depends on m
+	depends on NFC_FDP && I2C
+	---help---
+	  This module adds support for the Intel Fields Peak NFC controller
+	  i2c interface.
+	  Select this if your platform is using the i2c bus.
+
+	  If you choose to build a module, it'll be called fdp_i2c.
+	  Say N if unsure.