]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
cciss: fix bug if scsi tape support is disabled
authorMike Miller <mike.miller@hp.com>
Mon, 4 Aug 2008 09:54:55 +0000 (11:54 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Wed, 6 Aug 2008 10:30:04 +0000 (12:30 +0200)
Bug fix. If SCSI tape support is turned off we get an implicit declaration
of cciss_unregister_scsi error in cciss_remove_one.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Stephen M. Cameron <scameron@beardog.cca.cpqcorp.net>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
drivers/block/cciss.c

index 9ffa821fbfd71d80a7fe3fe3ea700af468c2a152..b73116ef92364e7993fba3c4bd2c5d164e2e6f1a 100644 (file)
@@ -3614,7 +3614,9 @@ static void __devexit cciss_remove_one(struct pci_dev *pdev)
                }
        }
 
+#ifdef CONFIG_CISS_SCSI_TAPE
        cciss_unregister_scsi(i);       /* unhook from SCSI subsystem */
+#endif
 
        cciss_shutdown(pdev);