sugar/linux
1
0
Fork 0
Code Activity

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

Browse Source 
Trivial manual merge fixup for usb_find_interface clashes.
This commit is contained in:
Linus Torvalds
2006-01-04 18:44:12 -08:00
parent 631b034724 fd586bacf4
commit db9edfd7e3
64 changed files with 878 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/ipr.c
View File

@@ -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;
}