Merge branch 'next-samsung-devel' into next-samsung-devel-2

Conflicts:
	arch/arm/mach-exynos4/clock.c
	arch/arm/mach-s3c2412/gpio.c
	arch/arm/mach-s5p64x0/dma.c
	arch/arm/mach-s5p64x0/gpiolib.c

1 files changed, 1 insertions, 5 deletions

diff --git a/include/linux/amba/pl330.h b/include/linux/amba/pl330.h
index cbee7de7dd36..d12f077a6daf 100644
--- a/include/linux/amba/pl330.h
+++ b/include/linux/amba/pl330.h
@@ -19,12 +19,8 @@ struct dma_pl330_peri {
          * Peri_Req i/f of the DMAC that is
          * peripheral could be reached from.
          */
-        u8 peri_id; /* {0, 31} */
+        u8 peri_id; /* specific dma id */
         enum pl330_reqtype rqtype;
-
-        /* For M->D and D->M Channels */
-        int burst_sz; /* in power of 2 */
-        dma_addr_t fifo_addr;
 };
 
 struct dma_pl330_platdata {