Disable DRM_I830 and [amd64] DRM_I810

svn path=/dists/trunk/linux-2.6/; revision=16469
This commit is contained in:
Ben Hutchings 2010-10-21 00:14:35 +00:00
parent 2e5e6a70cd
commit 4a8d5b5a2c
3 changed files with 9 additions and 2 deletions

2
debian/changelog vendored
View File

@ -19,6 +19,8 @@ linux-2.6 (2.6.36-1~experimental.1) UNRELEASED; urgency=low
(Closes: #598533)
* [x86] ata_piix: Add device ID for ICH4-L
* [armel/iop32x,ia64,x86] Disable BLK_DEV_PIIX as obsolete
* [amd64] Disable DRM_I810; i81x chipsets do not support 64-bit processors
* [x86] Disable DRM_I830; the i915 driver is now used instead
[ Martin Michlmayr ]
* Revert "orion/kirkwood: reset PCIe unit on boot" since it breaks

View File

@ -393,9 +393,9 @@ CONFIG_DRM=m
CONFIG_DRM_TDFX=m
CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
CONFIG_DRM_I810=m
# CONFIG_DRM_I810 is not set
## choice: Intel 830M, 845G, 852GM, 855GM, 865G
CONFIG_DRM_I830=m
# CONFIG_DRM_I830 is not set
CONFIG_DRM_I915=m
# CONFIG_DRM_I915_KMS is not set
## end choice

View File

@ -143,6 +143,11 @@ CONFIG_AGP_EFFICEON=y
##
CONFIG_CRYPTO_DEV_GEODE=m
##
## file: drivers/gpu/drm/Kconfig
##
CONFIG_DRM_I810=m
##
## file: drivers/i2c/busses/Kconfig
##