diff --git a/[refs] b/[refs]
index 61461405b7a8..bd51642dbcff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f93f18cd94626108021c4e681f48d2d99bca5b90
+refs/heads/master: 77b96bd7e5ee0b44aed1b77fef5949bc19e8301f
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 5f1e1cc6165a..f5521051a8dc 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -3546,6 +3546,10 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
 	for (j = 0; j <= hba[i]->highest_lun; j++)
 		add_disk(hba[i]->gendisk[j]);
 
+	/* we must register the controller even if no disks exist */
+	if (hba[i]->highest_lun == -1)
+		add_disk(hba[i]->gendisk[0]);
+
 	return 1;
 
       clean4: