2.6.15-git8 refresh and one patch update

4 files changed, 17 insertions, 17 deletions

diff --git a/driver/add-bttv-sub-bus_type-probe-and-remove-methods.patch b/driver/add-bttv-sub-bus_type-probe-and-remove-methods.patch
index 85452e923c441..436bb0c003329 100644
--- a/driver/add-bttv-sub-bus_type-probe-and-remove-methods.patch
+++ b/driver/add-bttv-sub-bus_type-probe-and-remove-methods.patch
@@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	struct dvb_bt8xx_card *card;
  	struct pci_dev* bttv_pci_dev;
  	int ret;
-@@ -891,13 +890,13 @@ static int dvb_bt8xx_probe(struct device
+@@ -890,13 +889,13 @@ static int dvb_bt8xx_probe(struct device
  		return ret;
  	}
  
@@ -45,7 +45,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	dprintk("dvb_bt8xx: unloading card%d\n", card->bttv_nr);
  
-@@ -920,14 +919,14 @@ static int dvb_bt8xx_remove(struct devic
+@@ -919,14 +918,14 @@ static int dvb_bt8xx_remove(struct devic
  static struct bttv_sub_driver driver = {
  	.drv = {
  		.name		= "dvb-bt8xx",
@@ -103,7 +103,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/drivers/media/video/bttv.h
 +++ gregkh-2.6/drivers/media/video/bttv.h
-@@ -364,6 +364,8 @@ struct bttv_sub_device {
+@@ -365,6 +365,8 @@ struct bttv_sub_device {
  struct bttv_sub_driver {
  	struct device_driver   drv;
  	char                   wanted[BUS_ID_SIZE];
diff --git a/driver/add-tiocx-bus_type-probe-remove-methods.patch b/driver/add-tiocx-bus_type-probe-remove-methods.patch
index 3d2baf74d75b8..869aa5a6f380f 100644
--- a/driver/add-tiocx-bus_type-probe-remove-methods.patch
+++ b/driver/add-tiocx-bus_type-probe-remove-methods.patch
@@ -14,7 +14,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/arch/ia64/sn/kernel/tiocx.c
 +++ gregkh-2.6/arch/ia64/sn/kernel/tiocx.c
-@@ -76,12 +76,6 @@ static void tiocx_bus_release(struct dev
+@@ -77,12 +77,6 @@ static void tiocx_bus_release(struct dev
  	kfree(to_cx_dev(dev));
  }
  
@@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /**
   * cx_device_match - Find cx_device in the id table.
   * @ids: id table from driver
-@@ -148,6 +142,14 @@ static int cx_driver_remove(struct devic
+@@ -149,6 +143,14 @@ static int cx_driver_remove(struct devic
  	return 0;
  }
  
@@ -36,13 +36,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +	.match = tiocx_match,
 +	.uevent = tiocx_uevent,
 +	.probe = cx_device_probe,
-+	.remove = cx_device_remove,
++	.remove = cx_driver_remove,
 +};
 +
  /**
   * cx_driver_register - Register the driver.
   * @cx_driver: driver table (cx_drv struct) from driver
-@@ -161,8 +163,6 @@ int cx_driver_register(struct cx_drv *cx
+@@ -162,8 +164,6 @@ int cx_driver_register(struct cx_drv *cx
  {
  	cx_driver->driver.name = cx_driver->name;
  	cx_driver->driver.bus = &tiocx_bus_type;
diff --git a/driver/allow-sysfs-attribute-files-to-be-pollable.patch b/driver/allow-sysfs-attribute-files-to-be-pollable.patch
index 54c1f1c9405a7..6a3e9fb447787 100644
--- a/driver/allow-sysfs-attribute-files-to-be-pollable.patch
+++ b/driver/allow-sysfs-attribute-files-to-be-pollable.patch
@@ -144,7 +144,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/fs/sysfs/inode.c
 +++ gregkh-2.6/fs/sysfs/inode.c
-@@ -245,3 +245,24 @@ void sysfs_hash_and_remove(struct dentry
+@@ -246,3 +246,24 @@ void sysfs_hash_and_remove(struct dentry
  	}
  	mutex_unlock(&dir->d_inode->i_mutex);
  }
diff --git a/driver/driver-model-convert-driver-model-to-mutexes.patch b/driver/driver-model-convert-driver-model-to-mutexes.patch
index 67139a710db2c..971011a783737 100644
--- a/driver/driver-model-convert-driver-model-to-mutexes.patch
+++ b/driver/driver-model-convert-driver-model-to-mutexes.patch
@@ -589,7 +589,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		struct dma_page		*page;
 --- gregkh-2.6.orig/drivers/base/firmware_class.c
 +++ gregkh-2.6/drivers/base/firmware_class.c
-@@ -14,6 +14,7 @@
+@@ -15,6 +15,7 @@
  #include <linux/vmalloc.h>
  #include <linux/interrupt.h>
  #include <linux/bitops.h>
@@ -597,7 +597,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include <asm/semaphore.h>
  
  #include <linux/firmware.h>
-@@ -35,7 +36,7 @@ static int loading_timeout = 10;	/* In s
+@@ -36,7 +37,7 @@ static int loading_timeout = 10;	/* In s
  
  /* fw_lock could be moved to 'struct firmware_priv' but since it is just
   * guarding for corner cases a global lock should be OK */
@@ -606,7 +606,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  struct firmware_priv {
  	char fw_id[FIRMWARE_NAME_MAX];
-@@ -144,9 +145,9 @@ firmware_loading_store(struct class_devi
+@@ -145,9 +146,9 @@ firmware_loading_store(struct class_devi
  
  	switch (loading) {
  	case 1:
@@ -618,7 +618,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			break;
  		}
  		vfree(fw_priv->fw->data);
-@@ -154,7 +155,7 @@ firmware_loading_store(struct class_devi
+@@ -155,7 +156,7 @@ firmware_loading_store(struct class_devi
  		fw_priv->fw->size = 0;
  		fw_priv->alloc_size = 0;
  		set_bit(FW_STATUS_LOADING, &fw_priv->status);
@@ -627,7 +627,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		break;
  	case 0:
  		if (test_bit(FW_STATUS_LOADING, &fw_priv->status)) {
-@@ -187,7 +188,7 @@ firmware_data_read(struct kobject *kobj,
+@@ -188,7 +189,7 @@ firmware_data_read(struct kobject *kobj,
  	struct firmware *fw;
  	ssize_t ret_count = count;
  
@@ -636,7 +636,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	fw = fw_priv->fw;
  	if (!fw || test_bit(FW_STATUS_DONE, &fw_priv->status)) {
  		ret_count = -ENODEV;
-@@ -202,7 +203,7 @@ firmware_data_read(struct kobject *kobj,
+@@ -203,7 +204,7 @@ firmware_data_read(struct kobject *kobj,
  
  	memcpy(buffer, fw->data + offset, ret_count);
  out:
@@ -645,7 +645,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	return ret_count;
  }
  
-@@ -253,7 +254,7 @@ firmware_data_write(struct kobject *kobj
+@@ -254,7 +255,7 @@ firmware_data_write(struct kobject *kobj
  	if (!capable(CAP_SYS_RAWIO))
  		return -EPERM;
  
@@ -654,7 +654,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	fw = fw_priv->fw;
  	if (!fw || test_bit(FW_STATUS_DONE, &fw_priv->status)) {
  		retval = -ENODEV;
-@@ -268,7 +269,7 @@ firmware_data_write(struct kobject *kobj
+@@ -269,7 +270,7 @@ firmware_data_write(struct kobject *kobj
  	fw->size = max_t(size_t, offset + count, fw->size);
  	retval = count;
  out:
@@ -663,7 +663,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	return retval;
  }
  
-@@ -436,14 +437,14 @@ _request_firmware(const struct firmware 
+@@ -437,14 +438,14 @@ _request_firmware(const struct firmware 
  	} else
  		wait_for_completion(&fw_priv->completion);