rpms/kernel/devel kernel.spec, 1.262, 1.263 linux-2.6-drm-mm.patch, 1.1, 1.2

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv703

Modified Files:
	kernel.spec linux-2.6-drm-mm.patch 
Log Message:
* Thu Nov 29 2007 Dave Airlie <airlied at linux.ie>
- update drm-mm-git.patch to enable sysfs udev device creation (#401961)



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- kernel.spec	28 Nov 2007 23:09:12 -0000	1.262
+++ kernel.spec	28 Nov 2007 23:53:33 -0000	1.263
@@ -1725,6 +1725,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Thu Nov 29 2007 Dave Airlie <airlied at linux.ie>
+- update drm-mm-git.patch to enable sysfs udev device creation (#401961)
+
 * Wed Nov 28 2007 Kyle McMartin <kmcmartin at redhat.com>
 - Update linux-2.6-debug-acpi-os-write-port.patch for changes to
   drivers/acpi/osl.c

linux-2.6-drm-mm.patch:

Index: linux-2.6-drm-mm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-drm-mm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-drm-mm.patch	27 Nov 2007 05:32:06 -0000	1.1
+++ linux-2.6-drm-mm.patch	28 Nov 2007 23:53:33 -0000	1.2
@@ -6818,7 +6818,7 @@
  	*head = (struct drm_head) {.dev = NULL};
  
 diff --git a/drivers/char/drm/drm_sysfs.c b/drivers/char/drm/drm_sysfs.c
-index cf4349b..6f8623c 100644
+index cf4349b..fa36153 100644
 --- a/drivers/char/drm/drm_sysfs.c
 +++ b/drivers/char/drm/drm_sysfs.c
 @@ -19,6 +19,45 @@
@@ -6886,7 +6886,7 @@
  	err = class_create_file(class, &class_attr_version);
  	if (err)
  		goto err_out_class;
-@@ -63,94 +105,105 @@ err_out:
+@@ -63,94 +105,100 @@ err_out:
  }
  
  /**
@@ -6977,12 +6977,7 @@
 +	dev->dev.parent = &dev->pdev->dev;
 +	dev->dev.class = drm_class;
 +	dev->dev.release = drm_sysfs_device_release;
-+	/*
-+	 * This will actually add the major:minor file so that udev
-+	 * will create the device node.  We don't want to do that just
-+	 * yet...
-+	 */
-+	/* dev->dev.devt = head->device; */
++	dev->dev.devt = head->device;
 +	snprintf(dev->dev.bus_id, BUS_ID_SIZE, "card%d", head->minor);
 +
 +	err = device_register(&dev->dev);