aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-12-16 13:30:41 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-12-16 13:30:41 +0000
commitd1b1c8ce710be710e0480e9baa0084cbc2246470 (patch)
treeaa9ba0fa5ae86cddb830ce1ad352535582c1694d
parent0a72881449f2c77dc4f370c3033f1f045f5e00ef (diff)
downloadalpine_aports-d1b1c8ce710be710e0480e9baa0084cbc2246470.tar.bz2
alpine_aports-d1b1c8ce710be710e0480e9baa0084cbc2246470.tar.xz
alpine_aports-d1b1c8ce710be710e0480e9baa0084cbc2246470.zip
main/linux-grsec: enable kms by default
-rw-r--r--main/linux-grsec/APKBUILD6
-rw-r--r--main/linux-grsec/kernelconfig.x864
-rw-r--r--main/linux-grsec/kernelconfig.x86_644
3 files changed, 7 insertions, 7 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 37bf39d0a2..bce1bb543f 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -4,7 +4,7 @@ _flavor=grsec
4pkgname=linux-${_flavor} 4pkgname=linux-${_flavor}
5pkgver=2.6.35.9 5pkgver=2.6.35.9
6_kernver=2.6.35 6_kernver=2.6.35
7pkgrel=3 7pkgrel=4
8pkgdesc="Linux kernel with grsecurity" 8pkgdesc="Linux kernel with grsecurity"
9url=http://grsecurity.net 9url=http://grsecurity.net
10depends="mkinitfs linux-firmware" 10depends="mkinitfs linux-firmware"
@@ -154,5 +154,5 @@ ea7a7eb2775b71ae5ef24d029a4905bd xfrm-fix-gre-key-endianess.patch
154139b39da44ecb577275be53d7d365949 r8169-add-gro-support.patch 154139b39da44ecb577275be53d7d365949 r8169-add-gro-support.patch
155648d8b477248f233c318a3b7a961febf 0001-Staging-hv-fix-sleeping-while-atomic-issue.patch 155648d8b477248f233c318a3b7a961febf 0001-Staging-hv-fix-sleeping-while-atomic-issue.patch
1568c224ba0cdf0aa572c7eb50379435be4 setlocalversion.patch 1568c224ba0cdf0aa572c7eb50379435be4 setlocalversion.patch
157a9494f66196bc6308da0f129221d31b8 kernelconfig.x86 15747ca10abf2b420ea393395325e3a67f6 kernelconfig.x86
158b38f1f99f8f3b75c52d4a1ab2b0d13fd kernelconfig.x86_64" 158eaa1f4b90c35ae9c94c16bbe4c4ba4f5 kernelconfig.x86_64"
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index 498f17bf8e..3d6d023ae2 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -3394,11 +3394,11 @@ CONFIG_DRM_TTM=m
3394CONFIG_DRM_TDFX=m 3394CONFIG_DRM_TDFX=m
3395CONFIG_DRM_R128=m 3395CONFIG_DRM_R128=m
3396CONFIG_DRM_RADEON=m 3396CONFIG_DRM_RADEON=m
3397# CONFIG_DRM_RADEON_KMS is not set 3397CONFIG_DRM_RADEON_KMS=y
3398CONFIG_DRM_I810=m 3398CONFIG_DRM_I810=m
3399CONFIG_DRM_I830=m 3399CONFIG_DRM_I830=m
3400CONFIG_DRM_I915=m 3400CONFIG_DRM_I915=m
3401# CONFIG_DRM_I915_KMS is not set 3401CONFIG_DRM_I915_KMS=y
3402CONFIG_DRM_MGA=m 3402CONFIG_DRM_MGA=m
3403CONFIG_DRM_SIS=m 3403CONFIG_DRM_SIS=m
3404CONFIG_DRM_VIA=m 3404CONFIG_DRM_VIA=m
diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64
index 627e7c812d..9f43887cd2 100644
--- a/main/linux-grsec/kernelconfig.x86_64
+++ b/main/linux-grsec/kernelconfig.x86_64
@@ -3227,11 +3227,11 @@ CONFIG_DRM_TTM=m
3227CONFIG_DRM_TDFX=m 3227CONFIG_DRM_TDFX=m
3228CONFIG_DRM_R128=m 3228CONFIG_DRM_R128=m
3229CONFIG_DRM_RADEON=m 3229CONFIG_DRM_RADEON=m
3230# CONFIG_DRM_RADEON_KMS is not set 3230CONFIG_DRM_RADEON_KMS=y
3231CONFIG_DRM_I810=m 3231CONFIG_DRM_I810=m
3232CONFIG_DRM_I830=m 3232CONFIG_DRM_I830=m
3233CONFIG_DRM_I915=m 3233CONFIG_DRM_I915=m
3234# CONFIG_DRM_I915_KMS is not set 3234CONFIG_DRM_I915_KMS=y
3235CONFIG_DRM_MGA=m 3235CONFIG_DRM_MGA=m
3236CONFIG_DRM_SIS=m 3236CONFIG_DRM_SIS=m
3237CONFIG_DRM_VIA=m 3237CONFIG_DRM_VIA=m