[kernel] r17302 - in dists/trunk/linux-2.6/debian: . config/mips config/mipsel patches/bugfix/all patches/series

[Aurelien Jarno]

Author: aurel32
Date: Thu May  5 14:53:48 2011
New Revision: 17302

Log:
* drm/nouveau, drm/radeon: remove fix for non-powerpc/sparc/x86.
  * [mips,mipsel] Disabled CONFIG_DRM_NOUVEAU and CONFIG_DRM_RADEON_KMS.

Deleted:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/drm-nouveau-Use-pci_dma_mapping_error.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/all/drm-radeon-Use-pci_dma_mapping_error.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/mips/config
   dists/trunk/linux-2.6/debian/config/mipsel/config
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed May  4 21:01:16 2011	(r17301)
+++ dists/trunk/linux-2.6/debian/changelog	Thu May  5 14:53:48 2011	(r17302)
@@ -11,6 +11,10 @@
   * [x86] Enable BRCMSMAC; the brcmsmac module replaces brcm80211
     (Closes: #625510)
 
+  [ Aurelien Jarno ]
+  * drm/nouveau, drm/radeon: remove fix for non-powerpc/sparc/x86.
+  * [mips,mipsel] Disabled CONFIG_DRM_NOUVEAU and CONFIG_DRM_RADEON_KMS.
+
  -- maximilian attems <maks at debian.org>  Tue, 01 May 2011 14:36:33 +0100
 
 linux-2.6 (2.6.39~rc5-1~experimental.1) experimental; urgency=low

Modified: dists/trunk/linux-2.6/debian/config/mips/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config	Wed May  4 21:01:16 2011	(r17301)
+++ dists/trunk/linux-2.6/debian/config/mips/config	Thu May  5 14:53:48 2011	(r17302)
@@ -8,6 +8,16 @@
 CONFIG_SECCOMP=y
 
 ##
+## file: drivers/gpu/drm/nouveau/Kconfig
+##
+# CONFIG_DRM_NOUVEAU is not set
+
+##
+## file: drivers/gpu/drm/radeon/Kconfig
+##
+# CONFIG_DRM_RADEON_KMS is not set
+
+##
 ## file: drivers/net/Kconfig
 ##
 # CONFIG_NIU is not set

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config	Wed May  4 21:01:16 2011	(r17301)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config	Thu May  5 14:53:48 2011	(r17302)
@@ -8,6 +8,16 @@
 CONFIG_SECCOMP=y
 
 ##
+## file: drivers/gpu/drm/nouveau/Kconfig
+##
+# CONFIG_DRM_NOUVEAU is not set
+
+##
+## file: drivers/gpu/drm/radeon/Kconfig
+##
+# CONFIG_DRM_RADEON_KMS is not set
+
+##
 ## file: drivers/net/Kconfig
 ##
 # CONFIG_NIU is not set

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Wed May  4 21:01:16 2011	(r17301)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Thu May  5 14:53:48 2011	(r17302)
@@ -42,7 +42,5 @@
 + features/all/perf-Define-make-variables-ARCH-and-SRCARCH-consiste.patch
 + debian/sched-autogroup-disabled.patch
 + bugfix/all/rt2800-disable-powersaving-as-default.patch
-+ bugfix/all/drm-nouveau-Use-pci_dma_mapping_error.patch
-+ bugfix/all/drm-radeon-Use-pci_dma_mapping_error.patch
 + bugfix/powerpc/powerpc-kexec-Fix-build-failure-on-32-bit-SMP.patch
 + bugfix/all/xhci-hcd-Include-linux-slab.h-in-xhci-pci.c.patch