diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-06 18:11:21 -0500 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-06 18:11:21 -0500 |
| commit | 55b85967f4e988d43a11bf0e432f15892e615db0 (patch) | |
| tree | 101c2ddb5df41d0b813e3985a8be5c25facc45bf /arch/arm/mach-exynos/include/mach/map.h | |
| parent | 3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff) | |
| parent | 55b6ef7a7dad269f4438404cc63ba4718c4f8805 (diff) | |
Merge branch 'next/cleanup-samsung' into next/cleanup-samsung-2
Diffstat (limited to 'arch/arm/mach-exynos/include/mach/map.h')
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/map.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h index 8480849affb9..e7373311bfbc 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h | |||
| @@ -279,7 +279,6 @@ | |||
| 279 | #define EXYNOS5_PA_UART1 0x12C10000 | 279 | #define EXYNOS5_PA_UART1 0x12C10000 |
| 280 | #define EXYNOS5_PA_UART2 0x12C20000 | 280 | #define EXYNOS5_PA_UART2 0x12C20000 |
| 281 | #define EXYNOS5_PA_UART3 0x12C30000 | 281 | #define EXYNOS5_PA_UART3 0x12C30000 |
| 282 | #define EXYNOS5_SZ_UART SZ_256 | ||
| 283 | 282 | ||
| 284 | #define S3C_VA_UARTx(x) (S3C_VA_UART + ((x) * S3C_UART_OFFSET)) | 283 | #define S3C_VA_UARTx(x) (S3C_VA_UART + ((x) * S3C_UART_OFFSET)) |
| 285 | 284 | ||