aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-grsec/kernelconfig.x86
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-09-22 08:30:27 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-09-22 09:27:31 +0000
commitdfde3a5736926775e97680a527bcbae9b482c23f (patch)
tree6a27647e0612b6d0741e3b1c4bd6cf77a609212a /main/linux-grsec/kernelconfig.x86
parent14f76f8aa67c544e5128061f4e478bfd35985de5 (diff)
downloadaports-dfde3a5736926775e97680a527bcbae9b482c23f.tar.bz2
aports-dfde3a5736926775e97680a527bcbae9b482c23f.tar.xz
main/linux-grsec: enable NFC for x86 and x86_64
ref #3366
Diffstat (limited to 'main/linux-grsec/kernelconfig.x86')
-rw-r--r--main/linux-grsec/kernelconfig.x8628
1 files changed, 25 insertions, 3 deletions
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index 55c4e12a2b..2a8bec9dd4 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.16 Kernel Configuration
+# Linux/x86 3.14.18 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1383,7 +1383,29 @@ CONFIG_NET_9P_RDMA=m
CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
-# CONFIG_NFC is not set
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_NCI_SPI=y
+CONFIG_NFC_HCI=m
+CONFIG_NFC_SHDLC=y
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_PN533=m
+CONFIG_NFC_WILINK=m
+CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_I2C=m
+CONFIG_NFC_PN544_MEI=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_I2C=m
+CONFIG_NFC_MICROREAD_MEI=m
+CONFIG_NFC_MRVL=m
+CONFIG_NFC_MRVL_USB=m
#
# Device Drivers
@@ -5868,7 +5890,6 @@ CONFIG_GRKERNSEC_HARDEN_IPC=y
#
# Network Protections
#
-CONFIG_GRKERNSEC_RANDNET=y
# CONFIG_GRKERNSEC_BLACKHOLE is not set
CONFIG_GRKERNSEC_NO_SIMULT_CONNECT=y
# CONFIG_GRKERNSEC_SOCKET is not set
@@ -6074,6 +6095,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_IO=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=m
CONFIG_CRC_T10DIF=m