summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-07-20 13:32:21 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-07-20 13:32:21 -0400
commit0c1d59e4a4d1412998c7879a6924b75a938f81f2 (patch)
treef3d5171eb05d0e2a2feec12d181bf08b365e8ec9
parent547660bd4cd65135d8f6f85d5aaa15964db2eabe (diff)
downloadkernel-0c1d59e4a4d1412998c7879a6924b75a938f81f2.tar.gz
kernel-0c1d59e4a4d1412998c7879a6924b75a938f81f2.tar.xz
kernel-0c1d59e4a4d1412998c7879a6924b75a938f81f2.zip
Enable NFC subsystem and drivers
-rw-r--r--config-generic13
-rw-r--r--kernel.spec3
2 files changed, 15 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index a1298aeee..b822a845f 100644
--- a/config-generic
+++ b/config-generic
@@ -1590,7 +1590,18 @@ CONFIG_BAYCOM_PAR=m
CONFIG_BAYCOM_EPP=m
CONFIG_YAM=m
-# CONFIG_NFC is not set
+CONFIG_NFC=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_HCI=m
+CONFIG_NFC_SHDLC=y
+CONFIG_NFC_LLCP=y
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_PN544_NFC=m
+CONFIG_PN544_HCI_NFC=m
+CONFIG_NFC_PN533=m
#
# IrDA (infrared) support
diff --git a/kernel.spec b/kernel.spec
index 3eba68d1b..0d563429e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2299,6 +2299,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Jul 20 2012 John W. Linville <linville@redhat.com>
+- Enable NFC subsystem and drivers
+
* Fri Jul 20 2012 Justin M. Forbes <jforbes@redhat.com> - 3.5.0-0.rc7.git4.1
- Linux v3.5-rc7-141-g85efc72