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

ref #2965

3 files changed, 18 insertions, 18 deletions

diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index bc90a97dc..46a9841da 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
-673f80f1d47c0a086782d74d97a4fca1  kernelconfig.x86
-9b84b8a4f9733b79460c6e5f6e632117  kernelconfig.x86_64
+d14ffce26900130c26cad2d833a7040c  kernelconfig.x86
+77450a0953917c3003023034afb4fead  kernelconfig.x86_64
 3d79d27ce4aea637042bb70055c35a3d  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
-da40c2648a5c9c7ee14c0bb8188d11e8ba95e86712f04869a509c27eeea5286e  kernelconfig.x86
-7329b8afd544cda8672cd5b00b3747d1eb190b72f85fb88841fda69d11e5e67c  kernelconfig.x86_64
+61f34085c2022112d9fd89c0de59c9c45f4a05c524ff919aeabb1cf381db0409  kernelconfig.x86
+db4ab1eda9da5761ca959b5a04dc867b0e91559bf7ee69a21e9d63dc384a5252  kernelconfig.x86_64
 a2dc0e30e1d1d691768543a17b51efccfc11ef17c04ac08f2b54c95f25dab75d  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
-0afde4aad7f5b33768adbf60a5d0945f2aea75615227263051af09a63c519b9d58bea66c5f4f3d1e64f6d3d4d42b2b17bb44e2e09ac83b202757f7c9534783aa  kernelconfig.x86
-7cd4af75021f0fd485dfa9687d6a9e6e060e89ee5a4d6965eb696c67fd4d494e7f781ac2aad3dda158ccce90e10bd5f6698cfc2a3489269278c0b3da58898017  kernelconfig.x86_64
+938f1680fecb06e09cbdfd2d0f876e767bd617194ebd83629664315ced3585fc305585527dfbe8f4e5a332f0220a4c9ed6fe0be4c399b1ef12d6de12b2abcd0c  kernelconfig.x86
+a5004586ab4d084304cc3c3e05a9aaa92283a16d1d7143b02bff8953185a10c8a7b7cc18bab80b4c977ff21a00fed8404ae9e82f4bb0732a905b7f16faef4598  kernelconfig.x86_64
 f341d200c5797a3ec6ade4234739ceca6bd6a4e3fb19175baadd3bb0eb54a0b200a84723f0c48bd18ee0b1afa4714920f96601d73aa73f629a79b1e04df28dfa  kernelconfig.armhf"
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index 2a8bec9dd..9f2f79836 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 d80ae897b..34617eb9e 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