From c8df9cd7be323fcb1620ebc2bdd7f005fab29b3b Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Sun, 10 May 2015 20:05:03 +0000
Subject: [PATCH] [x86] nfc: Enable NFC_HCI, NFC_MEI_PHY, NFC_PN544,
 NFC_PN544_MEI as modules (Closes: #770323)

svn path=/dists/trunk/linux/; revision=22588
---
 debian/changelog                    |  2 ++
 debian/config/kernelarch-x86/config | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 355bf2526..ad487ba26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -144,6 +144,8 @@ linux (4.0.2-1~exp1) UNRELEASED; urgency=medium
   * [x86] serial: Enable SERIAL_8250_DW as built-in
   * [armhf] Enable ARM_ERRATA_430973 (Closes: #768890), ARM_ERRATA_643719,
     ARM_ERRATA_754327, ARM_ERRATA_773022
+  * [x86] nfc: Enable NFC_HCI, NFC_MEI_PHY, NFC_PN544, NFC_PN544_MEI as
+    modules (Closes: #770323)
 
   [ Ian Campbell ]
   * [armhf] Enable support for Freescale SNVS RTC. (Closes: #782364)
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 10ce638e3..00e938e69 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1160,6 +1160,17 @@ CONFIG_TMD_HERMES=m
 CONFIG_PCI_HERMES=m
 CONFIG_PCMCIA_HERMES=m
 
+##
+## file: drivers/nfc/Kconfig
+##
+CONFIG_NFC_MEI_PHY=m
+
+##
+## file: drivers/nfc/pn544/Kconfig
+##
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_MEI=m
+
 ##
 ## file: drivers/pci/Kconfig
 ##
@@ -1840,6 +1851,11 @@ CONFIG_IRNET=m
 ##
 CONFIG_LAPB=m
 
+##
+## file: net/nfc/Kconfig
+##
+CONFIG_NFC_HCI=m
+
 ##
 ## file: net/vmw_vsock/Kconfig
 ##