diff options
| author |   Olof Johansson <olof@lixom.net> | 2012-10-01 14:07:32 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:07:32 -0700 |
| commit | 17a505edb09495510ac8998450980472c412455b (patch) | |
| tree | 07f3a9e512f67cffae1dde071c8247821dd17e60 /arch/arm/mach-exynos/include/mach/map.h | |
| parent | Merge tag 'usb-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb (diff) | |
| parent | Merge tag 'ep93xx-fixes-for-3.7' of git://github.com/RyanMallon/linux-ep93xx into next/fixes-non-critical (diff) | |
| download | linux-dev-17a505edb09495510ac8998450980472c412455b.tar.xz linux-dev-17a505edb09495510ac8998450980472c412455b.zip | |
Merge branch 'next/fixes-non-critical' into HEAD
Diffstat (limited to 'arch/arm/mach-exynos/include/mach/map.h')
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/map.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h index c72b675b3e4b..c941053dd5a1 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h @@ -89,7 +89,7 @@ #define EXYNOS4_PA_L2CC 0x10502000 #define EXYNOS4_PA_MDMA0 0x10810000 -#define EXYNOS4_PA_MDMA1 0x12840000 +#define EXYNOS4_PA_MDMA1 0x12850000 #define EXYNOS4_PA_PDMA0 0x12680000 #define EXYNOS4_PA_PDMA1 0x12690000 #define EXYNOS5_PA_MDMA0 0x10800000 |