diff options
| author | Ben Dooks | 2010-05-19 11:05:15 +0200 |
|---|---|---|
| committer | Ben Dooks | 2010-05-19 11:05:15 +0200 |
| commit | 1e8ff636beb6ee5c87868a6081cc4f95b1ccd713 (patch) | |
| tree | 5a6be34a53bf640c035d642b4d19388d6a7fd6cc /arch/arm/mach-s5p6442/include/mach/map.h | |
| parent | ARM: Merge for-2635/fb-updates1 (diff) | |
| parent | S5PV210: DMA: Add platform devices for PL330 DMACs (diff) | |
| download | kernel-qcow2-linux-1e8ff636beb6ee5c87868a6081cc4f95b1ccd713.tar.gz kernel-qcow2-linux-1e8ff636beb6ee5c87868a6081cc4f95b1ccd713.tar.xz kernel-qcow2-linux-1e8ff636beb6ee5c87868a6081cc4f95b1ccd713.zip | |
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-s5p6442/include/mach/map.h')
| -rw-r--r-- | arch/arm/mach-s5p6442/include/mach/map.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p6442/include/mach/map.h b/arch/arm/mach-s5p6442/include/mach/map.h index 685277d792fb..a263d77f6968 100644 --- a/arch/arm/mach-s5p6442/include/mach/map.h +++ b/arch/arm/mach-s5p6442/include/mach/map.h @@ -34,6 +34,9 @@ #define S5P6442_PA_VIC2 (0xE4200000) #define S5P_PA_VIC2 S5P6442_PA_VIC2 +#define S5P6442_PA_MDMA 0xE8000000 +#define S5P6442_PA_PDMA 0xE9000000 + #define S5P6442_PA_TIMER (0xEA000000) #define S5P_PA_TIMER S5P6442_PA_TIMER |