refresh to 2.6.17-git2

4 files changed, 8 insertions, 8 deletions

diff --git a/driver/device-class.patch b/driver/device-class.patch
index 04fca86c2cd8d..122af68097fa9 100644
--- a/driver/device-class.patch
+++ b/driver/device-class.patch
@@ -261,7 +261,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +EXPORT_SYMBOL_GPL(device_destroy);
 --- gregkh-2.6.orig/include/linux/device.h
 +++ gregkh-2.6/include/linux/device.h
-@@ -143,6 +143,7 @@ struct class {
+@@ -142,6 +142,7 @@ struct class {
  
  	struct subsystem	subsys;
  	struct list_head	children;
@@ -269,7 +269,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	struct list_head	interfaces;
  	struct semaphore	sem;	/* locks both the children and interfaces lists */
  
-@@ -306,6 +307,7 @@ struct device {
+@@ -305,6 +306,7 @@ struct device {
  	struct kobject kobj;
  	char	bus_id[BUS_ID_SIZE];	/* position on parent bus */
  	struct device_attribute uevent_attr;
@@ -277,7 +277,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	struct semaphore	sem;	/* semaphore to synchronize calls to
  					 * its driver.
-@@ -333,6 +335,11 @@ struct device {
+@@ -332,6 +334,11 @@ struct device {
  	struct dma_coherent_mem	*dma_mem; /* internal for coherent mem
  					     override */
  
@@ -289,7 +289,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	void	(*release)(struct device * dev);
  };
  
-@@ -374,6 +381,13 @@ extern int  device_attach(struct device 
+@@ -373,6 +380,13 @@ extern int  device_attach(struct device 
  extern void driver_attach(struct device_driver * drv);
  extern void device_reprobe(struct device *dev);
  
diff --git a/driver/driver-core-make-dev_info-and-friends-print-the-bus-name-if-there-is-no-driver.patch b/driver/driver-core-make-dev_info-and-friends-print-the-bus-name-if-there-is-no-driver.patch
index 8c7c43e7fb6d8..515096582b3fd 100644
--- a/driver/driver-core-make-dev_info-and-friends-print-the-bus-name-if-there-is-no-driver.patch
+++ b/driver/driver-core-make-dev_info-and-friends-print-the-bus-name-if-there-is-no-driver.patch
@@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/include/linux/device.h
 +++ gregkh-2.6/include/linux/device.h
-@@ -417,8 +417,9 @@ extern int firmware_register(struct subs
+@@ -416,8 +416,9 @@ extern int firmware_register(struct subs
  extern void firmware_unregister(struct subsystem *);
  
  /* debugging and troubleshooting/diagnostic helpers. */
diff --git a/driver/driver-core-remove-exports.patch b/driver/driver-core-remove-exports.patch
index 9891e53824dd0..95606badcdf81 100644
--- a/driver/driver-core-remove-exports.patch
+++ b/driver/driver-core-remove-exports.patch
@@ -140,7 +140,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/include/linux/device.h
 +++ gregkh-2.6/include/linux/device.h
-@@ -61,11 +61,6 @@ extern void bus_unregister(struct bus_ty
+@@ -60,11 +60,6 @@ extern void bus_unregister(struct bus_ty
  
  extern void bus_rescan_devices(struct bus_type * bus);
  
@@ -152,7 +152,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /* iterator helpers for buses */
  
  int bus_for_each_dev(struct bus_type * bus, struct device * start, void * data,
-@@ -164,9 +159,6 @@ struct class {
+@@ -163,9 +158,6 @@ struct class {
  extern int class_register(struct class *);
  extern void class_unregister(struct class *);
  
diff --git a/driver/tty-return-class-device-pointer-from-tty_register_device.patch b/driver/tty-return-class-device-pointer-from-tty_register_device.patch
index 6e093c4b66509..c72f71b6dbb8d 100644
--- a/driver/tty-return-class-device-pointer-from-tty_register_device.patch
+++ b/driver/tty-return-class-device-pointer-from-tty_register_device.patch
@@ -61,7 +61,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /**
 --- gregkh-2.6.orig/include/linux/tty.h
 +++ gregkh-2.6/include/linux/tty.h
-@@ -291,7 +291,9 @@ extern int tty_register_ldisc(int disc, 
+@@ -290,7 +290,9 @@ extern int tty_register_ldisc(int disc, 
  extern int tty_unregister_ldisc(int disc);
  extern int tty_register_driver(struct tty_driver *driver);
  extern int tty_unregister_driver(struct tty_driver *driver);