From 6e8cdcf09c03eb6ad2191b5dd93caaa2fc65eb11 Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Wed, 5 Dec 2012 14:53:33 +0100 Subject: main/linux-grsec: enable additional HID support --- main/linux-grsec/APKBUILD | 2 +- main/linux-grsec/kernelconfig.x86 | 15 +++++++++++---- main/linux-grsec/kernelconfig.x86_64 | 14 ++++++++++---- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 7d7453f72..b3e60051e 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=3.6.9 _kernver=3.6 -pkgrel=0 +pkgrel=1 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index 327e915fa..0e4dd3dfb 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.6 Kernel Configuration +# Linux/i386 3.6.9 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4262,9 +4262,14 @@ CONFIG_HID_KEYTOUCH=m # CONFIG_HID_KENSINGTON is not set CONFIG_HID_LCPOWER=m CONFIG_HID_LENOVO_TPKBD=m -# CONFIG_HID_LOGITECH is not set +CONFIG_HID_LOGITECH=m +CONFIG_HID_LOGITECH_DJ=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWHEELS_FF=y CONFIG_HID_MAGICMOUSE=m -# CONFIG_HID_MICROSOFT is not set +CONFIG_HID_MICROSOFT=m # CONFIG_HID_MONTEREY is not set CONFIG_HID_MULTITOUCH=m # CONFIG_HID_NTRIG is not set @@ -4290,7 +4295,8 @@ CONFIG_HID_HYPERV_MOUSE=m # CONFIG_HID_TOPSEED is not set # CONFIG_HID_THRUSTMASTER is not set # CONFIG_HID_WACOM is not set -# CONFIG_HID_WIIMOTE is not set +CONFIG_HID_WIIMOTE=m +CONFIG_HID_WIIMOTE_EXT=y # CONFIG_HID_ZEROPLUS is not set CONFIG_HID_ZYDACRON=m @@ -5672,3 +5678,4 @@ CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y CONFIG_CORDIC=m CONFIG_DDR=y + diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64 index 25ff07e9a..5fff73d34 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_64 3.6.8 Kernel Configuration +# Linux/x86_64 3.6.9 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -4157,9 +4157,14 @@ CONFIG_HID_KEYTOUCH=m # CONFIG_HID_KENSINGTON is not set CONFIG_HID_LCPOWER=m CONFIG_HID_LENOVO_TPKBD=m -# CONFIG_HID_LOGITECH is not set +CONFIG_HID_LOGITECH=m +CONFIG_HID_LOGITECH_DJ=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWHEELS_FF=y CONFIG_HID_MAGICMOUSE=m -# CONFIG_HID_MICROSOFT is not set +CONFIG_HID_MICROSOFT=m # CONFIG_HID_MONTEREY is not set CONFIG_HID_MULTITOUCH=m # CONFIG_HID_NTRIG is not set @@ -4185,7 +4190,8 @@ CONFIG_HID_HYPERV_MOUSE=m # CONFIG_HID_TOPSEED is not set # CONFIG_HID_THRUSTMASTER is not set # CONFIG_HID_WACOM is not set -# CONFIG_HID_WIIMOTE is not set +CONFIG_HID_WIIMOTE=m +CONFIG_HID_WIIMOTE_EXT=y # CONFIG_HID_ZEROPLUS is not set CONFIG_HID_ZYDACRON=m -- cgit v1.2.3