diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 18:51:59 +0900 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 18:51:59 +0900 |
commit | fac3d3555568de1755025a9609daf492dd548a59 (patch) | |
tree | 694d468070c32d9a01223ef76c2610ec3f5d4ff7 /arch/arm/mach-s5pv210/include/mach | |
parent | d48562abe29ceee66a6aad7b565b021ddd7f598a (diff) | |
parent | 41d8289d161e23e9cff78c914b6f37f30e627ea2 (diff) | |
download | op-kernel-dev-fac3d3555568de1755025a9609daf492dd548a59.zip op-kernel-dev-fac3d3555568de1755025a9609daf492dd548a59.tar.gz |
ARM: Merge for-2635-4/ts-machines
Merge branch 'for-2635-4/ts-machines' into for-2635-4/partial1
Diffstat (limited to 'arch/arm/mach-s5pv210/include/mach')
-rw-r--r-- | arch/arm/mach-s5pv210/include/mach/map.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h index 5adcb9f..e859570 100644 --- a/arch/arm/mach-s5pv210/include/mach/map.h +++ b/arch/arm/mach-s5pv210/include/mach/map.h @@ -75,8 +75,11 @@ /* AC97 */ #define S5PV210_PA_AC97 0xE2200000 +#define S5PV210_PA_ADC (0xE1700000) + /* compatibiltiy defines. */ #define S3C_PA_UART S5PV210_PA_UART #define S3C_PA_IIC S5PV210_PA_IIC0 +#define SAMSUNG_PA_ADC S5PV210_PA_ADC #endif /* __ASM_ARCH_MAP_H */ |