Merge

diff --cc drivers/scsi/scsi.c
index cdcf1e3c871a7627d183c8e8df6c9ca9ae0a6772,0048bb4ea889980f4e47431f398a1c48a7936ace..26b9a49cd49ae5356be4091157fd3575d5c4902e
--- 1/drivers/scsi/scsi.c
--- 2/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@@ -2516,9 -2594,8 +2562,11 @@@ static int __init init_scsi(void
                printk(KERN_INFO "scsi: host order: %s\n", scsihosts);  
        scsi_host_no_init (scsihosts);
  
+       bus_register(&scsi_driverfs_bus_type);
+ 
 +      /* Where we handle work queued by scsi_done */
 +      open_softirq(SCSI_SOFTIRQ, scsi_softirq, NULL);
 +
        return 0;
  }
  

diff --cc kernel/ksyms.c
Simple merge