patch refresh

1 files changed, 14 insertions, 14 deletions

diff --git a/driver/drm-classdev-cleanup.patch b/driver/drm-classdev-cleanup.patch
index 4d65cf5553737..28dd5a8f4018b 100644
--- a/driver/drm-classdev-cleanup.patch
+++ b/driver/drm-classdev-cleanup.patch
@@ -17,8 +17,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/char/drm/drm_sysfs.c |  129 +++++++++----------------------------------
  3 files changed, 34 insertions(+), 107 deletions(-)
 
---- gregkh-2.6.orig/drivers/char/drm/drm_sysfs.c	2006-01-17 08:27:27.000000000 -0800
-+++ gregkh-2.6/drivers/char/drm/drm_sysfs.c	2006-01-20 14:45:39.000000000 -0800
+--- gregkh-2.6.orig/drivers/char/drm/drm_sysfs.c
++++ gregkh-2.6/drivers/char/drm/drm_sysfs.c
 @@ -1,3 +1,4 @@
 +
  /*
@@ -61,7 +61,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /* Display the version of drm_core. This doesn't work right in current design */
  static ssize_t version_show(struct class *dev, char *buf)
  {
-@@ -69,38 +40,16 @@
+@@ -69,38 +40,16 @@ static CLASS_ATTR(version, S_IRUGO, vers
   * Note, the pointer created here is to be destroyed when finished by making a
   * call to drm_sysfs_destroy().
   */
@@ -108,7 +108,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  
  /**
-@@ -110,12 +59,13 @@
+@@ -110,12 +59,13 @@ struct drm_sysfs_class *drm_sysfs_create
   * Note, the pointer to be destroyed must have been created with a call to
   * drm_sysfs_create().
   */
@@ -125,7 +125,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  
  static ssize_t show_dri(struct class_device *class_device, char *buf)
-@@ -132,7 +82,7 @@
+@@ -132,7 +82,7 @@ static struct class_device_attribute cla
  
  /**
   * drm_sysfs_device_add - adds a class device to sysfs for a character driver
@@ -134,7 +134,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
   * @dev: the dev_t for the device to be added.
   * @device: a pointer to a struct device that is assiociated with this class device.
   * @fmt: string for the class device's name
-@@ -141,46 +91,26 @@
+@@ -141,46 +91,26 @@ static struct class_device_attribute cla
   * class.  A "dev" file will be created, showing the dev_t for the device.  The
   * pointer to the struct class_device will be returned from the call.  Any further
   * sysfs files that might be required can be created using this pointer.
@@ -194,7 +194,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  
  /**
-@@ -192,10 +122,9 @@
+@@ -192,10 +122,9 @@ error:
   */
  void drm_sysfs_device_remove(struct class_device *class_dev)
  {
@@ -207,9 +207,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +		class_device_remove_file(class_dev, &class_device_attrs[i]);
 +	class_device_unregister(class_dev);
  }
---- gregkh-2.6.orig/drivers/char/drm/drmP.h	2006-01-17 08:27:27.000000000 -0800
-+++ gregkh-2.6/drivers/char/drm/drmP.h	2006-01-20 14:30:33.000000000 -0800
-@@ -979,7 +979,7 @@
+--- gregkh-2.6.orig/drivers/char/drm/drmP.h
++++ gregkh-2.6/drivers/char/drm/drmP.h
+@@ -979,7 +979,7 @@ extern int drm_put_head(drm_head_t * hea
  extern unsigned int drm_debug;
  extern unsigned int drm_cards_limit;
  extern drm_head_t **drm_heads;
@@ -218,7 +218,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  extern struct proc_dir_entry *drm_proc_root;
  
  				/* Proc support (drm_proc.h) */
-@@ -1010,11 +1010,9 @@
+@@ -1010,11 +1010,9 @@ extern void __drm_pci_free(drm_device_t 
  extern void drm_pci_free(drm_device_t * dev, drm_dma_handle_t * dmah);
  
  			       /* sysfs support (drm_sysfs.c) */
@@ -233,9 +233,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  						 drm_head_t *head);
  extern void drm_sysfs_device_remove(struct class_device *class_dev);
  
---- gregkh-2.6.orig/drivers/char/drm/drm_stub.c	2006-01-17 08:27:27.000000000 -0800
-+++ gregkh-2.6/drivers/char/drm/drm_stub.c	2006-01-20 14:30:33.000000000 -0800
-@@ -50,7 +50,7 @@
+--- gregkh-2.6.orig/drivers/char/drm/drm_stub.c
++++ gregkh-2.6/drivers/char/drm/drm_stub.c
+@@ -50,7 +50,7 @@ module_param_named(cards_limit, drm_card
  module_param_named(debug, drm_debug, int, 0600);
  
  drm_head_t **drm_heads;