aboutsummaryrefslogtreecommitdiff
path: root/include/linux/amba
diff options
context:
space:
mode:
authorBoojin Kim <boojin.kim@samsung.com>2011-12-26 18:49:52 +0900
committerVinod Koul <vinod.koul@linux.intel.com>2012-03-08 17:59:28 +0530
commitb7d861d9394534db94f0fb8f4b9d984f996d0528 (patch)
treee15cc41a70ae01dcedeef7391708252aa55bd07d /include/linux/amba
parent6d0d7e2d554a2d1a39ee9397c3136df7a53ff348 (diff)
downloadvexpress-lsk-b7d861d9394534db94f0fb8f4b9d984f996d0528.tar.gz
DMA: PL330: Merge PL330 driver into drivers/dma/
Currently there were two part of DMAC PL330 driver for support old styled s3c-pl330 which has been merged into drivers/dma/pl330.c driver. Actually, there is no reason to separate them now. Basically this patch merges arch/arm/common/pl330.c into drivers/dma/pl330.c driver and removes useless exported symbol, externed function and so on. The newer pl330 driver tested on SMDKV310 and SMDK4212 boards Cc: Jassi Brar <jassisinghbrar@gmail.com> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Boojin Kim <boojin.kim@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Acked-by: Jassi Brar <jassisinghbrar@gmail.com> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'include/linux/amba')
-rw-r--r--include/linux/amba/pl330.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/amba/pl330.h b/include/linux/amba/pl330.h
index 12e023c19ac..fe93758e840 100644
--- a/include/linux/amba/pl330.h
+++ b/include/linux/amba/pl330.h
@@ -13,7 +13,6 @@
#define __AMBA_PL330_H_
#include <linux/dmaengine.h>
-#include <asm/hardware/pl330.h>
struct dma_pl330_platdata {
/*