diff --git a/[refs] b/[refs]
index 0368b99f6555..5c4a66b6a115 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96b0317906690997c16c7efffbc4c0fafcd6f7f2
+refs/heads/master: 404443081ce5e6f68b5f7eda16c959835ff200c0
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 00048bd26e7d..dc38368435aa 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -1370,6 +1370,7 @@ static void cciss_add_disk(ctlr_info_t *h, struct gendisk *disk,
 	disk->first_minor = drv_index << NWD_SHIFT;
 	disk->fops = &cciss_fops;
 	disk->private_data = &h->drv[drv_index];
+	disk->driverfs_dev = &h->pdev->dev;
 
 	/* Set up queue information */
 	blk_queue_bounce_limit(disk->queue, h->pdev->dma_mask);