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

[Ben Hutchings]

Author: benh
Date: Fri Aug 19 00:38:17 2011
New Revision: 17953

Log:
net: Enable NFC, NFC_PN533 as modules

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	Fri Aug 19 00:34:10 2011	(r17952)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Aug 19 00:38:17 2011	(r17953)
@@ -9,6 +9,7 @@
   * [x86] ACPI: Enable ACPI_APEI_GHES as built-in (no longer modular).
     Enable ACPI_APEI_MEMORY_FAILURE.
   * netfilter: Enable IP_SET_HASH_NETIFACE as module
+  * net: Enable NFC, NFC_PN533 as modules
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 27 Jul 2011 23:58:10 +0200
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Fri Aug 19 00:34:10 2011	(r17952)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Aug 19 00:38:17 2011	(r17953)
@@ -2092,6 +2092,11 @@
 # CONFIG_ZD1211RW_DEBUG is not set
 
 ##
+## file: drivers/nfc/Kconfig
+##
+CONFIG_NFC_PN533=m
+
+##
 ## file: drivers/of/Kconfig
 ##
 CONFIG_PROC_DEVICETREE=y
@@ -4200,6 +4205,11 @@
 # CONFIG_NETLABEL is not set
 
 ##
+## file: net/nfc/Kconfig
+##
+CONFIG_NFC=m
+
+##
 ## file: net/packet/Kconfig
 ##
 CONFIG_PACKET=y