diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-12-17 12:44:52 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-12-17 13:14:43 +0000 |
| commit | 8fff97ddf51b5a341aa1c252e20c725ebe7a57eb (patch) | |
| tree | b4aae613b20329543785101bcc5de87dba356084 /main/linux-vserver | |
| parent | 465ce0c068d96df85a4e30f6b6a420b0f69c95cd (diff) | |
| download | aports-8fff97ddf51b5a341aa1c252e20c725ebe7a57eb.tar.bz2 aports-8fff97ddf51b5a341aa1c252e20c725ebe7a57eb.tar.xz | |
Revert "main/linux-vserver: enable kms by default"
This reverts commit 89dee2cf3e5ea209875e0d8dd95bc80b8606a6e4.
Diffstat (limited to 'main/linux-vserver')
| -rw-r--r-- | main/linux-vserver/APKBUILD | 6 | ||||
| -rw-r--r-- | main/linux-vserver/kernelconfig.x86 | 4 | ||||
| -rw-r--r-- | main/linux-vserver/kernelconfig.x86_64 | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index 503463217..67657daa9 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -5,7 +5,7 @@ pkgname=linux-${_flavor} pkgver=2.6.35.9 _kernver=2.6.35 -pkgrel=2 +pkgrel=1 pkgdesc="Linux kernel with vserver" url="http://linux-vserver.org/" depends="mkinitfs linux-firmware" @@ -131,5 +131,5 @@ eca407cf4872ad77ae23adc8242389c4 patch-2.6.35.9.bz2 648d8b477248f233c318a3b7a961febf 0001-Staging-hv-fix-sleeping-while-atomic-issue.patch 915974abb0ad49337b91f0f487593fd2 patch-2.6.35.9-vs2.3.0.36.33.diff 8c224ba0cdf0aa572c7eb50379435be4 setlocalversion.patch -f703a5fa7a90d60e3e35bb92d1f99c37 kernelconfig.x86 -9483d5a8e2955d5e26b5ee70bac1d065 kernelconfig.x86_64" +10b1e713ce4422e69e1c96ba78feb7a9 kernelconfig.x86 +dc9477df20cf7da64bfc8e25fcd47ac3 kernelconfig.x86_64" diff --git a/main/linux-vserver/kernelconfig.x86 b/main/linux-vserver/kernelconfig.x86 index 31d9864d0..a081014d2 100644 --- a/main/linux-vserver/kernelconfig.x86 +++ b/main/linux-vserver/kernelconfig.x86 @@ -3418,11 +3418,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-vserver/kernelconfig.x86_64 b/main/linux-vserver/kernelconfig.x86_64 index 8253abd81..922b6d3a1 100644 --- a/main/linux-vserver/kernelconfig.x86_64 +++ b/main/linux-vserver/kernelconfig.x86_64 @@ -3278,11 +3278,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 |