diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 21:49:18 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 21:49:18 +0900 |
commit | d61bd77ff1e7c7a0a381c6e656dbc07b37510f37 (patch) | |
tree | 838f7b1c4d931814fbbc30643bb423f409e6daba /arch/arm/mach-s5pc100/include/mach/map.h | |
parent | f2b7e3c54a304677a1142829fb5913595885379f (diff) | |
parent | 1c739c7f374f77c5a355273c0c1d9345ed08c0ce (diff) | |
download | op-kernel-dev-d61bd77ff1e7c7a0a381c6e656dbc07b37510f37.zip op-kernel-dev-d61bd77ff1e7c7a0a381c6e656dbc07b37510f37.tar.gz |
Merge branch 'next-samsung' into for-next
Conflicts:
arch/arm/mach-s5p6440/Kconfig
arch/arm/mach-s5p6442/Kconfig
arch/arm/mach-s5pc100/Kconfig
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/cpu.c
arch/arm/plat-samsung/include/plat/sdhci.h
Diffstat (limited to 'arch/arm/mach-s5pc100/include/mach/map.h')
-rw-r--r-- | arch/arm/mach-s5pc100/include/mach/map.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h index c018697..01b9134 100644 --- a/arch/arm/mach-s5pc100/include/mach/map.h +++ b/arch/arm/mach-s5pc100/include/mach/map.h @@ -99,6 +99,10 @@ #define S5PC100_PA_FB (0xEE000000) +#define S5PC100_PA_FIMC0 (0xEE200000) +#define S5PC100_PA_FIMC1 (0xEE300000) +#define S5PC100_PA_FIMC2 (0xEE400000) + #define S5PC100_PA_I2S0 (0xF2000000) #define S5PC100_PA_I2S1 (0xF2100000) #define S5PC100_PA_I2S2 (0xF2200000) @@ -148,4 +152,8 @@ #define SAMSUNG_PA_CFCON S5PC100_PA_CFCON #define SAMSUNG_PA_KEYPAD S5PC100_PA_KEYPAD +#define S5P_PA_FIMC0 S5PC100_PA_FIMC0 +#define S5P_PA_FIMC1 S5PC100_PA_FIMC1 +#define S5P_PA_FIMC2 S5PC100_PA_FIMC2 + #endif /* __ASM_ARCH_C100_MAP_H */ |