diff --git a/[refs] b/[refs]
index d5d1e1119385..25ea82ab9d08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26fe19f76027b05c39faa9b728912631e91ec182
+refs/heads/master: 36478585d994f82654cf8435b34c1a8df3c6ae69
diff --git a/trunk/arch/blackfin/include/asm/dma.h b/trunk/arch/blackfin/include/asm/dma.h
index f58ca64d729c..65bf3d610a4c 100644
--- a/trunk/arch/blackfin/include/asm/dma.h
+++ b/trunk/arch/blackfin/include/asm/dma.h
@@ -111,11 +111,8 @@ struct dma_channel {
 	enum dma_chan_status chan_status;
 	struct dma_register *regs;
 	struct dmasg *sg;		/* large mode descriptor */
-	unsigned int ctrl_num;	/* controller number */
 	unsigned int irq;
 	void *data;
-	unsigned int dma_enable_flag;
-	unsigned int loopback_flag;
 #ifdef CONFIG_PM
 	unsigned short saved_peripheral_map;
 #endif