rk30: DMA: modify 'include <mach/dma-pl330.h>' to '#include <plat/dma-pl330.h>'...

diff --git a/arch/arm/mach-rk30/devices.c b/arch/arm/mach-rk30/devices.c
index 7b21a4606ee50d08b8450a3327845f6d51bef435..fcc81ea550d9ff4ef715b21214ea79ff0b0f19bf 100644 (file)
--- 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 6d169c9c947c2e21dd9fb5bbc553882545c71fe8..57cd93ea136975dfda2bf102feee559fe0ff5d90 100644 (file)
--- a/drivers/tty/serial/rk_serial.c
+++ b/drivers/tty/serial/rk_serial.c
@@ -91,7 +91,11 @@
 \r
 #define USE_DMA (UART0_USE_DMA | UART1_USE_DMA | UART2_USE_DMA | UART3_USE_DMA)\r
 #if USE_DMA\r
+#ifdef CONFIG_ARCH_RK29\r
 #include <mach/dma-pl330.h>\r
+#else\r
+#include <plat/dma-pl330.h>\r
+#endif\r
 #endif\r
 \r
 #define DMA_TX_TRRIGE_LEVEL 30\r