[kernel] r15409 - dists/sid/linux-2.6/debian/patches/bugfix/all

[Maximilian Attems]

Author: maks
Date: Tue Mar 16 22:28:21 2010
New Revision: 15409

Log:
update patch to disable MODULE_DEVICE_TABLE

"pciidlist is also used in struct drm_driver"
Reported-by: Julien Cristau <jcristau at debian.org>

Modified:
   dists/sid/linux-2.6/debian/patches/bugfix/all/drivers-gpu-nouveau-no-udev-auto-loading.patch

Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/drivers-gpu-nouveau-no-udev-auto-loading.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/drivers-gpu-nouveau-no-udev-auto-loading.patch	Tue Mar 16 22:18:42 2010	(r15408)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drivers-gpu-nouveau-no-udev-auto-loading.patch	Tue Mar 16 22:28:21 2010	(r15409)
@@ -6,29 +6,18 @@
 we need working xserver-xorg-video-nouveau to ship it,
 also maybe newer nouveau.
 ---
- drivers/gpu/drm/nouveau/nouveau_drv.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
 diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
-index da3b93b..2d85e31 100644
+index da3b93b..7c80bd3 100644
 --- a/drivers/gpu/drm/nouveau/nouveau_drv.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
-@@ -104,6 +104,7 @@ module_param_named(fbpercrtc, nouveau_fbpercrtc, int, 0400);
- #endif
- 
- static struct pci_device_id pciidlist[] = {
-+/* no autoload until xserver-xorg-video-nouveau
- 	{
- 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID),
- 		.class = PCI_BASE_CLASS_DISPLAY << 16,
-@@ -115,6 +116,7 @@ static struct pci_device_id pciidlist[] = {
- 		.class_mask  = 0xff << 16,
- 	},
+@@ -117,7 +117,9 @@ static struct pci_device_id pciidlist[] = {
  	{}
-+*/
  };
  
- MODULE_DEVICE_TABLE(pci, pciidlist);
--- 
-1.5.6.5
-
+-MODULE_DEVICE_TABLE(pci, pciidlist);
++/* no autoload until xserver-xorg-video-nouveau
++ * MODULE_DEVICE_TABLE(pci, pciidlist);
++ */
+ 
+ static struct drm_driver driver;
+