diff options
author | Dave Jones <davej@redhat.com> | 2012-01-13 17:39:23 -0500 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2012-01-13 17:39:23 -0500 |
commit | afa8ecf43bd29a9e620d5e60da8e54cc440475dc (patch) | |
tree | 2e902e4e97a1483132c97f28ea7d2230e3383f77 | |
parent | 277962e39f582d5827c1215d84dc0ba990d20072 (diff) | |
download | kernel-afa8ecf43bd29a9e620d5e60da8e54cc440475dc.tar.gz kernel-afa8ecf43bd29a9e620d5e60da8e54cc440475dc.tar.xz kernel-afa8ecf43bd29a9e620d5e60da8e54cc440475dc.zip |
Disable NFC
-rw-r--r-- | config-generic | 6 | ||||
-rw-r--r-- | kernel.spec | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/config-generic b/config-generic index e12dafe79..cb2685716 100644 --- a/config-generic +++ b/config-generic @@ -1645,11 +1645,7 @@ CONFIG_BAYCOM_PAR=m CONFIG_BAYCOM_EPP=m CONFIG_YAM=m -CONFIG_NFC=m -CONFIG_PN544_NFC=m -CONFIG_NFC_PN533=m -CONFIG_NFC_WILINK=m -CONFIG_NFC_NCI=m +# CONFIG_NFC is not set # # IrDA (infrared) support diff --git a/kernel.spec b/kernel.spec index 37002aa0b..83c29fd95 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2318,6 +2318,9 @@ fi # || || %changelog * Fri Jan 13 2012 Dave Jones <davej@redhat.com> +- Disable NFC drivers. + +* Fri Jan 13 2012 Dave Jones <davej@redhat.com> - Enable CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK (On by default in rawhide/-debug) |