diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:05:15 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:05:15 -0400 |
| commit | 1e8ff636beb6ee5c87868a6081cc4f95b1ccd713 (patch) | |
| tree | 5a6be34a53bf640c035d642b4d19388d6a7fd6cc /arch/arm/mach-s5pv210/include/mach/map.h | |
| parent | 32457942b90aabb9242b450f02d18d9c8d982916 (diff) | |
| parent | 7d1a2077a7e519fc0c68617526abea3f72632e60 (diff) | |
ARM: Merge for-2635/s5p-dma
Merge branch 'for-2635/s5p-dma' into for-linus/samsung2
Conflicts:
arch/arm/mach-s5pv210/Makefile
Diffstat (limited to 'arch/arm/mach-s5pv210/include/mach/map.h')
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/map.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h index c22694c8231f..c038585080c0 100644 --- a/arch/arm/mach-s5pv210/include/mach/map.h +++ b/arch/arm/mach-s5pv210/include/mach/map.h | |||
| @@ -43,6 +43,10 @@ | |||
| 43 | 43 | ||
| 44 | #define S5PV210_PA_SROMC (0xE8000000) | 44 | #define S5PV210_PA_SROMC (0xE8000000) |
| 45 | 45 | ||
| 46 | #define S5PV210_PA_MDMA 0xFA200000 | ||
| 47 | #define S5PV210_PA_PDMA0 0xE0900000 | ||
| 48 | #define S5PV210_PA_PDMA1 0xE0A00000 | ||
| 49 | |||
| 46 | #define S5PV210_PA_VIC0 (0xF2000000) | 50 | #define S5PV210_PA_VIC0 (0xF2000000) |
| 47 | #define S5P_PA_VIC0 S5PV210_PA_VIC0 | 51 | #define S5P_PA_VIC0 S5PV210_PA_VIC0 |
| 48 | 52 | ||