From 1a0cb11b3c8bdda63eb676a5179229ad5c7f6084 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 26 May 2012 16:58:15 +0100
Subject: [PATCH] --- yaml --- r: 321138 b: refs/heads/master c:
 48afb3112e6373a292e54d675e986a5da14c0516 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/dma/amba-pl08x.c   | 7 -------
 trunk/include/linux/amba/pl08x.h | 4 ----
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index bc00eba011f2..1c86e1f9c692 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c15a6ef6ea3ff06df2d532d314f85da48cb067e8
+refs/heads/master: 48afb3112e6373a292e54d675e986a5da14c0516
diff --git a/trunk/drivers/dma/amba-pl08x.c b/trunk/drivers/dma/amba-pl08x.c
index 9c5bae6f85b5..5821125f0458 100644
--- a/trunk/drivers/dma/amba-pl08x.c
+++ b/trunk/drivers/dma/amba-pl08x.c
@@ -1701,13 +1701,6 @@ static int pl08x_dma_init_virtual_channels(struct pl08x_driver_data *pl08x,
 				return -ENOMEM;
 			}
 		}
-		if (chan->cd->circular_buffer) {
-			dev_err(&pl08x->adev->dev,
-				"channel %s: circular buffers not supported\n",
-				chan->name);
-			kfree(chan);
-			continue;
-		}
 		dev_dbg(&pl08x->adev->dev,
 			 "initialize virtual channel \"%s\"\n",
 			 chan->name);
diff --git a/trunk/include/linux/amba/pl08x.h b/trunk/include/linux/amba/pl08x.h
index 02549017212a..0f5b34d668b6 100644
--- a/trunk/include/linux/amba/pl08x.h
+++ b/trunk/include/linux/amba/pl08x.h
@@ -51,9 +51,6 @@ enum {
  * can be the address of a FIFO register for burst requests for example.
  * This can be left undefined if the PrimeCell API is used for configuring
  * this.
- * @circular_buffer: whether the buffer passed in is circular and
- * shall simply be looped round round (like a record baby round
- * round round round)
  * @single: the device connected to this channel will request single DMA
  * transfers, not bursts. (Bursts are default.)
  * @periph_buses: the device connected to this channel is accessible via
@@ -66,7 +63,6 @@ struct pl08x_channel_data {
 	u32 muxval;
 	u32 cctl;
 	dma_addr_t addr;
-	bool circular_buffer;
 	bool single;
 	u8 periph_buses;
 };