Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

Trivial manual merge fixup for usb_find_interface clashes.

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index b6714da4d6e2..27acf78cf8d8 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -2132,7 +2132,7 @@ restart:
         }
 
         spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
-        kobject_uevent(&ioa_cfg->host->shost_classdev.kobj, KOBJ_CHANGE, NULL);
+        kobject_uevent(&ioa_cfg->host->shost_classdev.kobj, KOBJ_CHANGE);
         LEAVE;
 }