From: hhb <hhb@rock-chips.com>
Date: Fri, 10 Feb 2012 07:39:45 +0000 (+0800)
Subject: rk30: DMA: modify 'include <mach/dma-pl330.h>' to  '#include <plat/dma-pl330.h>'... 
X-Git-Tag: firefly_0821_release~9595^2~155
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=e4897236ec555b561c4f65f45d5890274a0bd052;p=firefly-linux-kernel-4.4.55.git

rk30: DMA: modify 'include <mach/dma-pl330.h>' to  '#include <plat/dma-pl330.h>' in devices.c and rk_serial.c
---

diff --git a/arch/arm/mach-rk30/devices.c b/arch/arm/mach-rk30/devices.c
index 7b21a4606ee5..fcc81ea550d9 100644
--- a/arch/arm/mach-rk30/devices.c
+++ b/arch/arm/mach-rk30/devices.c
@@ -21,7 +21,7 @@
 #include <asm/pmu.h>
 #include <mach/irqs.h>
 #include <mach/board.h>
-#include <mach/dma-pl330.h>
+#include <plat/dma-pl330.h>
 
 static u64 dma_dmamask = DMA_BIT_MASK(32);
 
diff --git a/drivers/tty/serial/rk_serial.c b/drivers/tty/serial/rk_serial.c
index 6d169c9c947c..57cd93ea1369 100644
--- a/drivers/tty/serial/rk_serial.c
+++ b/drivers/tty/serial/rk_serial.c
@@ -91,7 +91,11 @@
 
 #define USE_DMA (UART0_USE_DMA | UART1_USE_DMA | UART2_USE_DMA | UART3_USE_DMA)
 #if USE_DMA
+#ifdef CONFIG_ARCH_RK29
 #include <mach/dma-pl330.h>
+#else
+#include <plat/dma-pl330.h>
+#endif
 #endif
 
 #define DMA_TX_TRRIGE_LEVEL 30