Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / arch / arm / mach-exynos / include / mach / map.h

diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
index aa3760e..61b74e1 100644 (file)
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -91,6 +91,7 @@
 
 #define EXYNOS4_PA_MDMA0               0x10810000
 #define EXYNOS4_PA_MDMA1               0x12850000
+#define EXYNOS4_PA_S_MDMA1             0x12840000
 #define EXYNOS4_PA_PDMA0               0x12680000
 #define EXYNOS4_PA_PDMA1               0x12690000
 #define EXYNOS5_PA_MDMA0               0x10800000
@@ -280,7 +281,6 @@
 #define EXYNOS5_PA_UART1               0x12C10000
 #define EXYNOS5_PA_UART2               0x12C20000
 #define EXYNOS5_PA_UART3               0x12C30000
-#define EXYNOS5_SZ_UART                        SZ_256
 
 #define EXYNOS5440_PA_UART0            0x000B0000
 #define EXYNOS5440_PA_UART1            0x000C0000