2.6.17-git21 refresh

8 files changed, 21 insertions, 21 deletions

diff --git a/driver/device-class-attr.patch b/driver/device-class-attr.patch
index ec55e5f68cd25..33e44482e961c 100644
--- a/driver/device-class-attr.patch
+++ b/driver/device-class-attr.patch
@@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/base/core.c
 +++ gregkh-2.6/drivers/base/core.c
-@@ -95,6 +95,8 @@ static void device_release(struct kobjec
+@@ -94,6 +94,8 @@ static void device_release(struct kobjec
  
  	if (dev->release)
  		dev->release(dev);
@@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	else {
  		printk(KERN_ERR "Device '%s' does not have a release() function, "
  			"it is broken and must be fixed.\n",
-@@ -180,6 +182,15 @@ static int dev_uevent(struct kset *kset,
+@@ -179,6 +181,15 @@ static int dev_uevent(struct kset *kset,
  		}
  	}
  
@@ -58,7 +58,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	return retval;
  }
  
-@@ -225,6 +236,43 @@ static void device_remove_groups(struct 
+@@ -224,6 +235,43 @@ static void device_remove_groups(struct 
  	}
  }
  
@@ -102,7 +102,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static ssize_t show_dev(struct device *dev, struct device_attribute *attr,
  			char *buf)
  {
-@@ -379,6 +427,8 @@ int device_add(struct device *dev)
+@@ -378,6 +426,8 @@ int device_add(struct device *dev)
  		}
  	}
  
@@ -111,7 +111,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	if ((error = device_add_groups(dev)))
  		goto GroupError;
  	if ((error = device_pm_add(dev)))
-@@ -409,6 +459,8 @@ int device_add(struct device *dev)
+@@ -408,6 +458,8 @@ int device_add(struct device *dev)
   PMError:
  	device_remove_groups(dev);
   GroupError:
@@ -120,7 +120,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	if (dev->devt_attr) {
  		device_remove_file(dev, dev->devt_attr);
  		kfree(dev->devt_attr);
-@@ -506,6 +558,7 @@ void device_del(struct device * dev)
+@@ -505,6 +557,7 @@ void device_del(struct device * dev)
  	}
  	device_remove_file(dev, &dev->uevent_attr);
  	device_remove_groups(dev);
diff --git a/driver/device-class-parent.patch b/driver/device-class-parent.patch
index 4db7d4c41fb8d..4595521d8bf25 100644
--- a/driver/device-class-parent.patch
+++ b/driver/device-class-parent.patch
@@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
   *
   * This file is released under the GPLv2
   *
-@@ -370,10 +372,11 @@ int device_add(struct device *dev)
+@@ -369,10 +371,11 @@ int device_add(struct device *dev)
  				  "subsystem");
  		sysfs_create_link(&dev->class->subsys.kset.kobj, &dev->kobj,
  				  dev->bus_id);
@@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	}
  
  	if ((error = device_add_groups(dev)))
-@@ -492,8 +495,10 @@ void device_del(struct device * dev)
+@@ -491,8 +494,10 @@ void device_del(struct device * dev)
  		sysfs_remove_link(&dev->kobj, "subsystem");
  		sysfs_remove_link(&dev->class->subsys.kset.kobj, dev->bus_id);
  		class_name = make_class_name(dev->class->name, &dev->kobj);
@@ -60,7 +60,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		kfree(class_name);
  		down(&dev->class->sem);
  		list_del_init(&dev->node);
-@@ -622,10 +627,6 @@ struct device *device_create(struct clas
+@@ -621,10 +626,6 @@ struct device *device_create(struct clas
  
  	if (class == NULL || IS_ERR(class))
  		goto error;
diff --git a/driver/device-groups.patch b/driver/device-groups.patch
index 26c0d5e7b21a1..f18746f30ff43 100644
--- a/driver/device-groups.patch
+++ b/driver/device-groups.patch
@@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/base/core.c
 +++ gregkh-2.6/drivers/base/core.c
-@@ -194,6 +194,35 @@ static ssize_t store_uevent(struct devic
+@@ -193,6 +193,35 @@ static ssize_t store_uevent(struct devic
  	return count;
  }
  
@@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static ssize_t show_dev(struct device *dev, struct device_attribute *attr,
  			char *buf)
  {
-@@ -347,6 +376,8 @@ int device_add(struct device *dev)
+@@ -346,6 +375,8 @@ int device_add(struct device *dev)
  		sysfs_create_link(&dev->parent->kobj, &dev->kobj, class_name);
  	}
  
@@ -61,7 +61,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	if ((error = device_pm_add(dev)))
  		goto PMError;
  	if ((error = bus_add_device(dev)))
-@@ -373,6 +404,8 @@ int device_add(struct device *dev)
+@@ -372,6 +403,8 @@ int device_add(struct device *dev)
   BusError:
  	device_pm_remove(dev);
   PMError:
@@ -70,7 +70,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	if (dev->devt_attr) {
  		device_remove_file(dev, dev->devt_attr);
  		kfree(dev->devt_attr);
-@@ -467,6 +500,7 @@ void device_del(struct device * dev)
+@@ -466,6 +499,7 @@ void device_del(struct device * dev)
  		up(&dev->class->sem);
  	}
  	device_remove_file(dev, &dev->uevent_attr);
diff --git a/driver/driver-core-bus.c-cleanups.patch b/driver/driver-core-bus.c-cleanups.patch
index dcde3ab4e0bab..f591481fd86ab 100644
--- a/driver/driver-core-bus.c-cleanups.patch
+++ b/driver/driver-core-bus.c-cleanups.patch
@@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/base/bus.c
 +++ gregkh-2.6/drivers/base/bus.c
-@@ -130,7 +130,7 @@ static struct kobj_type ktype_bus = {
+@@ -129,7 +129,7 @@ static struct kobj_type ktype_bus = {
  
  };
  
@@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  
  #ifdef CONFIG_HOTPLUG
-@@ -599,12 +599,13 @@ void put_bus(struct bus_type * bus)
+@@ -598,12 +598,13 @@ void put_bus(struct bus_type * bus)
   *
   *	Note that kset_find_obj increments bus' reference count.
   */
diff --git a/driver/driver-core-fix-driver-core-kernel-doc.patch b/driver/driver-core-fix-driver-core-kernel-doc.patch
index e189866910be0..f6d11b48bb7e8 100644
--- a/driver/driver-core-fix-driver-core-kernel-doc.patch
+++ b/driver/driver-core-fix-driver-core-kernel-doc.patch
@@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/base/core.c
 +++ gregkh-2.6/drivers/base/core.c
-@@ -560,9 +560,9 @@ static void device_create_release(struct
+@@ -559,9 +559,9 @@ static void device_create_release(struct
  
  /**
   * device_create - creates a device and registers it with sysfs
@@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
   * @fmt: string for the class device's name
   *
   * This function can be used by char device classes.  A struct
-@@ -622,7 +622,7 @@ EXPORT_SYMBOL_GPL(device_create);
+@@ -621,7 +621,7 @@ EXPORT_SYMBOL_GPL(device_create);
  /**
   * device_destroy - removes a device that was created with device_create()
   * @class: the pointer to the struct class that this device was registered * with.
diff --git a/driver/put_device-might_sleep.patch b/driver/put_device-might_sleep.patch
index ea053150c3312..d6c432ff46425 100644
--- a/driver/put_device-might_sleep.patch
+++ b/driver/put_device-might_sleep.patch
@@ -12,7 +12,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/base/core.c
 +++ gregkh-2.6/drivers/base/core.c
-@@ -515,6 +515,7 @@ struct device * get_device(struct device
+@@ -514,6 +514,7 @@ struct device * get_device(struct device
   */
  void put_device(struct device * dev)
  {
diff --git a/driver/sysfs-crash-debugging.patch b/driver/sysfs-crash-debugging.patch
index 75e72da11d2b7..9c2c59538c3d0 100644
--- a/driver/sysfs-crash-debugging.patch
+++ b/driver/sysfs-crash-debugging.patch
@@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/arch/i386/kernel/traps.c
 +++ gregkh-2.6/arch/i386/kernel/traps.c
-@@ -431,6 +431,7 @@ void die(const char * str, struct pt_reg
+@@ -430,6 +430,7 @@ void die(const char * str, struct pt_reg
  #endif
  		if (nl)
  			printk("\n");
@@ -35,7 +35,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  				NOTIFY_STOP) {
 --- gregkh-2.6.orig/arch/x86_64/kernel/traps.c
 +++ gregkh-2.6/arch/x86_64/kernel/traps.c
-@@ -488,6 +488,7 @@ void __kprobes __die(const char * str, s
+@@ -487,6 +487,7 @@ void __kprobes __die(const char * str, s
  	printk("DEBUG_PAGEALLOC");
  #endif
  	printk("\n");
diff --git a/driver/the-scheduled-unexport-of-insert_resource.patch b/driver/the-scheduled-unexport-of-insert_resource.patch
index b20d657d7daa8..f71f5e6f10e5a 100644
--- a/driver/the-scheduled-unexport-of-insert_resource.patch
+++ b/driver/the-scheduled-unexport-of-insert_resource.patch
@@ -50,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			     resource_size_t max, resource_size_t align,
 --- gregkh-2.6.orig/kernel/resource.c
 +++ gregkh-2.6/kernel/resource.c
-@@ -405,8 +405,6 @@ int insert_resource(struct resource *par
+@@ -404,8 +404,6 @@ int insert_resource(struct resource *par
  	return result;
  }