diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 21:44:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 21:44:12 -0500 |
| commit | db9edfd7e339ca4113153d887e782dd05be5a9eb (patch) | |
| tree | 0a4ba12447a0cabc800adc7e9667d284777b0181 /drivers/scsi | |
| parent | 631b034724364b413e8a52e7c2e03a9d77e4c2b4 (diff) | |
| parent | fd586bacf439f36dea9b9bf6e6133ac87df2730c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
Trivial manual merge fixup for usb_find_interface clashes.
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/ipr.c | 2 |
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: | |||
| 2132 | } | 2132 | } |
| 2133 | 2133 | ||
| 2134 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); | 2134 | spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); |
| 2135 | kobject_uevent(&ioa_cfg->host->shost_classdev.kobj, KOBJ_CHANGE, NULL); | 2135 | kobject_uevent(&ioa_cfg->host->shost_classdev.kobj, KOBJ_CHANGE); |
| 2136 | LEAVE; | 2136 | LEAVE; |
| 2137 | } | 2137 | } |
| 2138 | 2138 | ||