diff --git a/[refs] b/[refs]
index 4de1d61bd24f..ad06f584418f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 935dc8d7575e6c1292b057e39045a40f1fbe26e7
+refs/heads/master: ba198efb5ef4e5f4927a18ff95a58f40c58cbaa9
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 9ffa821fbfd7..b73116ef9236 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/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);