[kernel] r15218 - in dists/trunk/linux-2.6/debian/patches: features/all series

[Ben Hutchings]

Author: benh
Date: Fri Feb 19 03:37:13 2010
New Revision: 15218

Log:
Fix up features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch for 2.6.33-rc8

Modified:
   dists/trunk/linux-2.6/debian/patches/features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/patches/features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch	Fri Feb 19 03:35:30 2010	(r15217)
+++ dists/trunk/linux-2.6/debian/patches/features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch	Fri Feb 19 03:37:13 2010	(r15218)
@@ -1,14 +1,12 @@
-diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
-index 7f436ec..0c27723 100644
 --- a/drivers/gpu/drm/i915/i915_drv.c
 +++ b/drivers/gpu/drm/i915/i915_drv.c
 @@ -52,9 +52,7 @@ static struct pci_device_id pciidlist[] = {
- 	i915_PCI_IDS
+ 	{0, 0, 0}
  };
  
 -#if defined(CONFIG_DRM_I915_KMS)
  MODULE_DEVICE_TABLE(pci, pciidlist);
 -#endif
  
- static int i915_suspend(struct drm_device *dev, pm_message_t state)
+ static int i915_drm_freeze(struct drm_device *dev)
  {

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Fri Feb 19 03:35:30 2010	(r15217)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Fri Feb 19 03:37:13 2010	(r15218)
@@ -42,7 +42,7 @@
 + features/arm/compression-add-lzma.patch
 + features/arm/openrd-client.patch
 
-#+ features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch
++ features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch
 
 + bugfix/ia64/ia64-Include-linux-personality.h-header-in-asm-fcntl.patch