main/linux-grsec: build ehci-hcd into kernel

fixes #2965

3 files changed, 18 insertions, 18 deletions

diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index a670a997d..1ee53080c 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
 esac
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs linux-firmware"
@@ -169,22 +169,22 @@ md5sums="b621207b3f6ecbb67db18b13258f8ea8  linux-3.14.tar.xz
 16d0d944ffb7d3889828f6777c5ff227  grsecurity-3.0-3.14.19-201409282024.patch
 c6a4ae7e8ca6159e1631545515805216  fix-memory-map-for-PIE-applications.patch
 1a307fc1d63231bf01d22493a4f14378  imx6q-no-unclocked-sleep.patch
-6fe6d27e5480fd996dde5f5425cabf83  kernelconfig.x86
-120599cd7aabd8103c197f5afed15417  kernelconfig.x86_64
+48059b9613240d6ab8ca8f90049185e3  kernelconfig.x86
+87d1a051e340605e176d2b9e64efbc1e  kernelconfig.x86_64
 06aec787b9b0279a6b603b0d3655c38b  kernelconfig.armhf"
 sha256sums="61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa  linux-3.14.tar.xz
 8f168278944be5109f7bcb7488578acb9fdba985ae9fc44a04eefd4fe27d8591  patch-3.14.19.xz
 15738fd826a0bdf2c5fceecde3ec59f8eacbcaa59b5fa099f0a64fc32975b217  grsecurity-3.0-3.14.19-201409282024.patch
 500f3577310be52e87b9fecdc2e9c4ca43210fd97d69089f9005d484563f74c7  fix-memory-map-for-PIE-applications.patch
 21179fbb22a5b74af0a609350ae1a170e232908572b201d02e791d2ce0a685d3  imx6q-no-unclocked-sleep.patch
-9588cb438582f803b7e092fd67d8a8e8470534104787b059b83d59aa5e72dd15  kernelconfig.x86
-115acca81ea83b90d5d328535da3580a8f6d6568d1dd1a8844debc363c44779b  kernelconfig.x86_64
+eb19ab30681185992cc8a382e2c0aaf5e81f35ab5464099eb38c9aef4504430c  kernelconfig.x86
+e006ecf3ccdb63fcaba78282d9976a767a0c54ee1c949843928a004e6f0b9748  kernelconfig.x86_64
 f7fddd997aeec29d1105bbc099b4c8b27f7a872379618a5df592697d6e1a281c  kernelconfig.armhf"
 sha512sums="5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e  linux-3.14.tar.xz
 be2cb79e7a9282244db9073160d426497dbb1815ce38050354181adc5d84dff09f597ff6980a3c29553300a2d38aa161ee25b53b8e122eb1891cfbdd950ba3eb  patch-3.14.19.xz
 e7fb38331f2564b100a0ab5c20912066c16c608081097adaabde9387003de9d7be09b27c4f957becef65627856a340d56270818401ac82077a228e2165cc21ce  grsecurity-3.0-3.14.19-201409282024.patch
 4665c56ae1bbac311f9205d64918e84ee8b01d47d6e2396ff6b8adfb10aada7f7254531ce62e31edbb65c2a54a830f09ad05d314dfcd75d6272f4068945ad7c7  fix-memory-map-for-PIE-applications.patch
 87d1ad59732f265a5b0db54490dc1762c14ea4b868e7eb1aedc3ce57b48046de7bbc08cf5cfcf6f1380fa84063b0edb16ba3d5e3c5670be9bbb229275c88b221  imx6q-no-unclocked-sleep.patch
-99820bab507e24f60a3e9bbbf458175103c8d4062870c4931bd77a85b9445059d155ce42b4c2e78d0675dad487648340d0214f7de0fa4d602199377f1a2cc233  kernelconfig.x86
-06616e3eed3ac255c895f994662e7a56364dad56df3a8b7ab552da0cdd3e8fa13f3616d559444545864b596548b5ff5ab25a08504ad70c7d7c65782e1e258180  kernelconfig.x86_64
+9dcd44ce0210249871dfa928e797b034cdc8ea0e9a0bc9d2af75692320de039898af1eaf11af20c5ab5bb0e80763f6f4b05e2bc8f9aa16187a40bd6629f9936a  kernelconfig.x86
+a585ac9f3844b6915e105eae96613d5cffd93b668ff569c2ab58a77950d57a4d174ed8a3de4fd795d364269d4e790b873076abfcd19a940bbc2f4a6adf15d281  kernelconfig.x86_64
 bee0ca939124446da61082fd1dfc3734636eee230497c7f984d8459507ba35e01fb21a263f459f990337f637b091c5d1738a8772878c0d364f9c9d3188d08379  kernelconfig.armhf"
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index 053dc8fe1..53801c3b9 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -4614,9 +4614,9 @@ CONFIG_USB_HIDDEV=y
 CONFIG_I2C_HID=m
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
+CONFIG_USB_COMMON=y
 CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
+CONFIG_USB=y
 # CONFIG_USB_DEBUG is not set
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 
@@ -4637,11 +4637,11 @@ CONFIG_USB_WUSB_CBAF=m
 #
 CONFIG_USB_C67X00_HCD=m
 CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-CONFIG_USB_EHCI_PCI=m
-CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_EHCI_PCI=y
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ISP1760_HCD=m
diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64
index 1abb48fff..001d2aaae 100644
--- a/main/linux-grsec/kernelconfig.x86_64
+++ b/main/linux-grsec/kernelconfig.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.18 Kernel Configuration
+# Linux/x86 3.14.19 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -4467,9 +4467,9 @@ CONFIG_USB_HIDDEV=y
 CONFIG_I2C_HID=m
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
+CONFIG_USB_COMMON=y
 CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
+CONFIG_USB=y
 # CONFIG_USB_DEBUG is not set
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 
@@ -4490,11 +4490,11 @@ CONFIG_USB_WUSB_CBAF=m
 #
 CONFIG_USB_C67X00_HCD=m
 CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-CONFIG_USB_EHCI_PCI=m
-CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_EHCI_PCI=y
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ISP1760_HCD=m