Merge ssh://linux-scsi.bkbits.net/scsi-misc-2.5

into flossy.devel.redhat.com:/usr/local/home/dledford/bk/linus-2.5

drivers/scsi/scsi_lib.c

@@ -12,6 +12,7 @@
 #include <linux/bio.h>
 #include <linux/kernel.h>
 #include <linux/blk.h>
+#include <asm/hardirq.h>
 #include <linux/smp_lock.h>
 #include <linux/completion.h>
 

drivers/scsi/scsi_proc.c

@@ -16,14 +16,13 @@
  * Michael A. Griffith <grif@acm.org>
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
+#include <linux/init.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/errno.h>
-#include <linux/stat.h>
 #include <linux/blk.h>
 #include <asm/uaccess.h>
 

drivers/scsi/scsi_scan.c

@@ -1872,7 +1872,7 @@ int scsi_add_single_device(uint host, uint channel, uint id, uint lun)
 	if (!shost)
 		return -ENODEV;
 	sdev = scsi_find_device(shost, channel, id, lun);
-	if (!sdev)
+	if (sdev)
 		goto out;
 
 	error = -ENOMEM;