From: Mike Miller <mike.miller@hp.com>
Date: Mon, 4 Aug 2008 09:54:55 +0000 (+0200)
Subject: cciss: fix bug if scsi tape support is disabled
X-Git-Tag: v2.6.27-rc3~74^2~2
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=ba198efb5ef4e5f4927a18ff95a58f40c58cbaa9

cciss: fix bug if scsi tape support is disabled

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>
---

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 9ffa821fbfd..b73116ef923 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -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);