[kernel] r18306 - in dists/trunk/linux-2.6/debian: . config

[Ben Hutchings]

Author: benh
Date: Tue Nov 22 06:33:51 2011
New Revision: 18306

Log:
nfc: enable NFC_NCI as module

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Nov 22 06:23:39 2011	(r18305)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Nov 22 06:33:51 2011	(r18306)
@@ -5,6 +5,7 @@
   * aufs: Update to aufs3.x-rcN-20111114
   * ieee802154: Enable IEEE802154_6LOWPAN as module
   * can: Enable CAN_GW, CAN_EMS_PCMCIA, CAN_PEAK_PCI as modules
+  * nfc: enable NFC_NCI as module
 
   [ Uwe Kleine-König ]
   * [amd64] reenable rt featureset with 3.2-rc2-rt3

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Tue Nov 22 06:23:39 2011	(r18305)
+++ dists/trunk/linux-2.6/debian/config/config	Tue Nov 22 06:33:51 2011	(r18306)
@@ -4288,6 +4288,11 @@
 CONFIG_NFC=m
 
 ##
+## file: net/nfc/nci/Kconfig
+##
+CONFIG_NFC_NCI=m
+
+##
 ## file: net/packet/Kconfig
 ##
 CONFIG_PACKET=y