summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-06-12 16:12:03 -0700
committerOlof Johansson <olof@lixom.net>2013-06-12 16:13:48 -0700
commit6e36dc69d6df49fe3380241b72c99515e1eee032 (patch)
tree8353fcae0a56cc2fd301686027095b4ccfcf9817 /arch/arm/plat-samsung
parent1780db9e210420f2cf7f26f0ab06eb02f02df21f (diff)
parenta496bda66201e855f6b5d5d701d8bd65b9178700 (diff)
downloadop-kernel-dev-6e36dc69d6df49fe3380241b72c99515e1eee032.zip
op-kernel-dev-6e36dc69d6df49fe3380241b72c99515e1eee032.tar.gz
Merge tag 's3c24xx-arch-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc
From Kukjin Kim, DMA driver updates for s3c24xx. * tag 's3c24xx-arch-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: S3C24XX: remove obsolete s3c2412 specific dma settings ARM: S3C24XX: dma-s3c2443 - do not write into arbitary bits ARM: S3C24XX: split s3c2412 spi dma channels Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r--arch/arm/plat-samsung/include/plat/dma-s3c24xx.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h b/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h
index d015763..bd3a6db 100644
--- a/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h
+++ b/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h
@@ -28,7 +28,6 @@ struct s3c24xx_dma_map {
const char *name;
unsigned long channels[S3C_DMA_CHANNELS];
- unsigned long channels_rx[S3C_DMA_CHANNELS];
};
struct s3c24xx_dma_selection {
@@ -38,10 +37,6 @@ struct s3c24xx_dma_selection {
void (*select)(struct s3c2410_dma_chan *chan,
struct s3c24xx_dma_map *map);
-
- void (*direction)(struct s3c2410_dma_chan *chan,
- struct s3c24xx_dma_map *map,
- enum dma_data_direction dir);
};
extern int s3c24xx_dma_init_map(struct s3c24xx_dma_selection *sel);
OpenPOWER on IntegriCloud