[kernel] r22588 - in dists/trunk/linux/debian: . config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Sun May 10 20:05:03 2015
New Revision: 22588

Log:
[x86] nfc: Enable NFC_HCI, NFC_MEI_PHY, NFC_PN544, NFC_PN544_MEI as modules (Closes: #770323)

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sun May 10 20:00:44 2015	(r22587)
+++ dists/trunk/linux/debian/changelog	Sun May 10 20:05:03 2015	(r22588)
@@ -144,6 +144,8 @@
   * [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)

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Sun May 10 20:00:44 2015	(r22587)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Sun May 10 20:05:03 2015	(r22588)
@@ -1161,6 +1161,17 @@
 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
 ##
 CONFIG_HT_IRQ=y
@@ -1841,6 +1852,11 @@
 CONFIG_LAPB=m
 
 ##
+## file: net/nfc/Kconfig
+##
+CONFIG_NFC_HCI=m
+
+##
 ## file: net/vmw_vsock/Kconfig
 ##
 CONFIG_VSOCKETS=m