aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-vanilla/kernelconfig.x86
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-09-18 13:46:51 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-09-19 08:58:18 +0000
commit54a8932887a08e171e0f9f1d5733992fb1ac5a0b (patch)
tree4591311dd1f8e4424b9e9a58d889aba28cc3ff86 /main/linux-vanilla/kernelconfig.x86
parent6058069170cc5d19155f0ed85a63d7a5132f2280 (diff)
downloadaports-54a8932887a08e171e0f9f1d5733992fb1ac5a0b.tar.gz
aports-54a8932887a08e171e0f9f1d5733992fb1ac5a0b.tar.bz2
aports-54a8932887a08e171e0f9f1d5733992fb1ac5a0b.tar.xz
main/linux-vanilla: sync with grsec
- remove usbkbd and usbmouse - enable NFC we disable randomize_base on x86 as it seems to break module loading
Diffstat (limited to 'main/linux-vanilla/kernelconfig.x86')
-rw-r--r--main/linux-vanilla/kernelconfig.x8632
1 files changed, 27 insertions, 5 deletions
diff --git a/main/linux-vanilla/kernelconfig.x86 b/main/linux-vanilla/kernelconfig.x86
index 011eb8eee5..29c1d7682d 100644
--- a/main/linux-vanilla/kernelconfig.x86
+++ b/main/linux-vanilla/kernelconfig.x86
@@ -485,8 +485,7 @@ CONFIG_SCHED_HRTICK=y
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x1000000
CONFIG_RELOCATABLE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x20000000
+# CONFIG_RANDOMIZE_BASE is not set
CONFIG_X86_NEED_RELOCS=y
CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_HOTPLUG_CPU=y
@@ -1385,7 +1384,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
@@ -4468,8 +4489,8 @@ CONFIG_USB_HIDDEV=y
#
# USB HID Boot Protocol drivers
#
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
#
# I2C HID support
@@ -5793,6 +5814,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