Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

[pandora-kernel.git] / arch / arm / mach-msm / include / mach / msm_iomap-8x60.h

diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
index 5bd18db..3b19b8f 100644 (file)
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
@@ -62,40 +62,4 @@
 #define MSM8X60_TMR0_PHYS      0x02040000
 #define MSM8X60_TMR0_SIZE      SZ_4K
 
-#define MSM_IOMMU_JPEGD_PHYS   0x07300000
-#define MSM_IOMMU_JPEGD_SIZE   SZ_1M
-
-#define MSM_IOMMU_VPE_PHYS     0x07400000
-#define MSM_IOMMU_VPE_SIZE     SZ_1M
-
-#define MSM_IOMMU_MDP0_PHYS    0x07500000
-#define MSM_IOMMU_MDP0_SIZE    SZ_1M
-
-#define MSM_IOMMU_MDP1_PHYS    0x07600000
-#define MSM_IOMMU_MDP1_SIZE    SZ_1M
-
-#define MSM_IOMMU_ROT_PHYS     0x07700000
-#define MSM_IOMMU_ROT_SIZE     SZ_1M
-
-#define MSM_IOMMU_IJPEG_PHYS   0x07800000
-#define MSM_IOMMU_IJPEG_SIZE   SZ_1M
-
-#define MSM_IOMMU_VFE_PHYS     0x07900000
-#define MSM_IOMMU_VFE_SIZE     SZ_1M
-
-#define MSM_IOMMU_VCODEC_A_PHYS        0x07A00000
-#define MSM_IOMMU_VCODEC_A_SIZE        SZ_1M
-
-#define MSM_IOMMU_VCODEC_B_PHYS        0x07B00000
-#define MSM_IOMMU_VCODEC_B_SIZE        SZ_1M
-
-#define MSM_IOMMU_GFX3D_PHYS   0x07C00000
-#define MSM_IOMMU_GFX3D_SIZE   SZ_1M
-
-#define MSM_IOMMU_GFX2D0_PHYS  0x07D00000
-#define MSM_IOMMU_GFX2D0_SIZE  SZ_1M
-
-#define MSM_IOMMU_GFX2D1_PHYS  0x07E00000
-#define MSM_IOMMU_GFX2D1_SIZE  SZ_1M
-
 #endif