diff --git a/[refs] b/[refs]
index d3b864c6f865..aa898bfbab00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d61c42690c6e2ff093a3d01338dad49f35b1e27b
+refs/heads/master: 32a87c0114f37871aefb12a30de3e0c3300e3646
diff --git a/trunk/drivers/block/cciss.h b/trunk/drivers/block/cciss.h
index e5c63e579ffc..1d95db254069 100644
--- a/trunk/drivers/block/cciss.h
+++ b/trunk/drivers/block/cciss.h
@@ -57,7 +57,7 @@ typedef struct _drive_info_struct
 
 struct Cmd_sg_list {
 	SGDescriptor_struct	*sgchain;
-	dma64_addr_t		sg_chain_dma;
+	dma_addr_t		sg_chain_dma;
 	int			chain_block_size;
 };