summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung
diff options
context:
space:
mode:
authorKukjin Kim2011-09-16 08:43:06 +0200
committerKukjin Kim2011-09-16 08:43:06 +0200
commit3e461977d1aff9b4d1785815f4eb2098657a0500 (patch)
treeb175d4733e06a1f486fab8d02049a075c5285776 /arch/arm/plat-samsung
parentARM: S3C64XX: Remove unused CPU devices for Cragganmore (diff)
parentARM: S3C24XX: Remove s3c24xx_dma_addr definition (diff)
downloadkernel-qcow2-linux-3e461977d1aff9b4d1785815f4eb2098657a0500.tar.gz
kernel-qcow2-linux-3e461977d1aff9b4d1785815f4eb2098657a0500.tar.xz
kernel-qcow2-linux-3e461977d1aff9b4d1785815f4eb2098657a0500.zip
Merge branch 'next/topic-cleanup-dma' into next-samsung-cleanup
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r--arch/arm/plat-samsung/include/plat/dma-s3c24xx.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h b/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h
index 336d5ac02035..ab9bce637cbd 100644
--- a/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h
+++ b/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h
@@ -18,11 +18,6 @@ extern struct s3c2410_dma_chan s3c2410_chans[S3C_DMA_CHANNELS];
#define DMA_CH_VALID (1<<31)
#define DMA_CH_NEVER (1<<30)
-struct s3c24xx_dma_addr {
- unsigned long from;
- unsigned long to;
-};
-
/* struct s3c24xx_dma_map
*
* this holds the mapping information for the channel selected
@@ -31,7 +26,6 @@ struct s3c24xx_dma_addr {
struct s3c24xx_dma_map {
const char *name;
- struct s3c24xx_dma_addr hw_addr;
unsigned long channels[S3C_DMA_CHANNELS];
unsigned long channels_rx[S3C_DMA_CHANNELS];