diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-12-17 12:45:42 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-12-17 13:14:43 +0000 |
commit | 67e77b0b7891f1ee6351952ff38835c7b9cb749d (patch) | |
tree | 9f80f0b98f6d580c7ba093d10f5b4df84b7a1090 /main/linux-grsec | |
parent | 8fff97ddf51b5a341aa1c252e20c725ebe7a57eb (diff) | |
download | aports-67e77b0b7891f1ee6351952ff38835c7b9cb749d.tar.bz2 aports-67e77b0b7891f1ee6351952ff38835c7b9cb749d.tar.xz |
Revert "main/linux-grsec: enable kms by default"
This reverts commit d1b1c8ce710be710e0480e9baa0084cbc2246470.
Diffstat (limited to 'main/linux-grsec')
-rw-r--r-- | main/linux-grsec/APKBUILD | 6 | ||||
-rw-r--r-- | main/linux-grsec/kernelconfig.x86 | 4 | ||||
-rw-r--r-- | main/linux-grsec/kernelconfig.x86_64 | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index bce1bb543f..37bf39d0a2 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -4,7 +4,7 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=2.6.35.9 _kernver=2.6.35 -pkgrel=4 +pkgrel=3 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -154,5 +154,5 @@ ea7a7eb2775b71ae5ef24d029a4905bd xfrm-fix-gre-key-endianess.patch 139b39da44ecb577275be53d7d365949 r8169-add-gro-support.patch 648d8b477248f233c318a3b7a961febf 0001-Staging-hv-fix-sleeping-while-atomic-issue.patch 8c224ba0cdf0aa572c7eb50379435be4 setlocalversion.patch -47ca10abf2b420ea393395325e3a67f6 kernelconfig.x86 -eaa1f4b90c35ae9c94c16bbe4c4ba4f5 kernelconfig.x86_64" +a9494f66196bc6308da0f129221d31b8 kernelconfig.x86 +b38f1f99f8f3b75c52d4a1ab2b0d13fd kernelconfig.x86_64" diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index 3d6d023ae2..498f17bf8e 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -3394,11 +3394,11 @@ CONFIG_DRM_TTM=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m -CONFIG_DRM_RADEON_KMS=y +# CONFIG_DRM_RADEON_KMS is not set CONFIG_DRM_I810=m CONFIG_DRM_I830=m CONFIG_DRM_I915=m -CONFIG_DRM_I915_KMS=y +# CONFIG_DRM_I915_KMS is not set CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64 index 9f43887cd2..627e7c812d 100644 --- a/main/linux-grsec/kernelconfig.x86_64 +++ b/main/linux-grsec/kernelconfig.x86_64 @@ -3227,11 +3227,11 @@ CONFIG_DRM_TTM=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m -CONFIG_DRM_RADEON_KMS=y +# CONFIG_DRM_RADEON_KMS is not set CONFIG_DRM_I810=m CONFIG_DRM_I830=m CONFIG_DRM_I915=m -CONFIG_DRM_I915_KMS=y +# CONFIG_DRM_I915_KMS is not set CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m |