Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / arch / arm / plat-samsung / include / plat / map-s5p.h

diff --git a/arch/arm/plat-samsung/include/plat/map-s5p.h b/arch/arm/plat-samsung/include/plat/map-s5p.h
index b63aeebb93f3bc70e00823867efd8e61ebad70f1..0fe2828f93547fa63a0abf3636b21d95a90f307d 100644 (file)
--- a/arch/arm/plat-samsung/include/plat/map-s5p.h
+++ b/arch/arm/plat-samsung/include/plat/map-s5p.h
@@ -14,10 +14,6 @@
 #define __ASM_PLAT_MAP_S5P_H __FILE__
 
 #define S5P_VA_CHIPID          S3C_ADDR(0x02000000)
-#define S5P_VA_CMU             S3C_ADDR(0x02100000)
-
-#define S5P_VA_DMC0            S3C_ADDR(0x02440000)
-#define S5P_VA_DMC1            S3C_ADDR(0x02480000)
 
 #define S5P_VA_COREPERI_BASE   S3C_ADDR(0x02800000)
 #define S5P_VA_COREPERI(x)     (S5P_VA_COREPERI_BASE + (x))