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

[Ben Hutchings]

Author: benh
Date: Sun Dec  6 16:28:47 2009
New Revision: 14740

Log:
i915: Enable auto-loading even though CONFIG_DRM_I915_KMS is not set

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Dec  6 16:11:08 2009	(r14739)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Dec  6 16:28:47 2009	(r14740)
@@ -42,6 +42,7 @@
   * usbnet: Set link down initially for drivers that update link state
     (Closes: #444043)
   * aufs2: Update to snapshot from 2009-11-29
+  * i915: Enable auto-loading even though CONFIG_DRM_I915_KMS is not set
 
   [ dann frazier ]
   * mac80211 (CVE-2009-4026, CVE-2009-4027):

Added: dists/trunk/linux-2.6/debian/patches/features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch	Sun Dec  6 16:28:47 2009	(r14740)
@@ -0,0 +1,14 @@
+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
+ };
+ 
+-#if defined(CONFIG_DRM_I915_KMS)
+ MODULE_DEVICE_TABLE(pci, pciidlist);
+-#endif
+ 
+ static int i915_suspend(struct drm_device *dev, pm_message_t state)
+ {

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Sun Dec  6 16:11:08 2009	(r14739)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Sun Dec  6 16:28:47 2009	(r14740)
@@ -80,3 +80,4 @@
 + bugfix/all/atl1e-remove-broken-tsov6.patch
 + features/all/atl1e-allow-offload-disable.patch
 + bugfix/all/usbnet-link-down-initially-for-drivers-that-update.patch
++ features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch