[kernel] r16469 - in dists/trunk/linux-2.6/debian: . config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Thu Oct 21 00:14:35 2010
New Revision: 16469

Log:
Disable DRM_I830 and [amd64] DRM_I810

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu Oct 21 00:07:19 2010	(r16468)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Oct 21 00:14:35 2010	(r16469)
@@ -19,6 +19,8 @@
     (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

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Thu Oct 21 00:07:19 2010	(r16468)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Thu Oct 21 00:14:35 2010	(r16469)
@@ -393,9 +393,9 @@
 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

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Thu Oct 21 00:07:19 2010	(r16468)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Thu Oct 21 00:14:35 2010	(r16469)
@@ -144,6 +144,11 @@
 CONFIG_CRYPTO_DEV_GEODE=m
 
 ##
+## file: drivers/gpu/drm/Kconfig
+##
+CONFIG_DRM_I810=m
+
+##
 ## file: drivers/i2c/busses/Kconfig
 ##
 CONFIG_SCx200_I2C=m