Merge current mainline tree into linux-omap tree

[pandora-kernel.git] / arch / arm / mach-omap1 / mmu.h

diff --git a/arch/arm/mach-omap1/mmu.h b/arch/arm/mach-omap1/mmu.h
index 75966b2..918688e 100644 (file)
--- a/arch/arm/mach-omap1/mmu.h
+++ b/arch/arm/mach-omap1/mmu.h
@@ -76,7 +76,7 @@
 
 #define OMAP_MMU_LD_TLB_RD             0x0002
 
-#define INIT_TLB_ENTRY(ent,v,p,ps)                     \
+#define INIT_TLB_ENTRY(ent, v, p, ps)                  \
 do {                                                   \
        (ent)->va       = (v);                          \
        (ent)->pa       = (p);                          \
@@ -86,7 +86,7 @@ do {                                                  \
        (ent)->tlb      = 1;                            \
 } while (0)
 
-#define INIT_TLB_ENTRY_4KB_PRESERVED(ent,v,p)          \
+#define INIT_TLB_ENTRY_4KB_PRESERVED(ent, v, p)        \
 do {                                                   \
        (ent)->va       = (v);                          \
        (ent)->pa       = (p);                          \
@@ -95,8 +95,6 @@ do {                                                  \
        (ent)->ap       = OMAP_MMU_RAM_L_AP_FA;         \
 } while (0)
 
-extern struct omap_mmu_ops omap1_mmu_ops;
-
 struct omap_mmu_tlb_entry {
        unsigned long va;
        unsigned long pa;
@@ -118,12 +116,4 @@ static inline void omap_mmu_write_reg(struct omap_mmu *mmu,
        __raw_writew(val, mmu->base + reg);
 }
 
-int omap_dsp_request_mem(void);
-void omap_dsp_release_mem(void);
-
-static inline void omap_mmu_itack(struct omap_mmu *mmu)
-{
-       omap_mmu_write_reg(mmu, OMAP_MMU_IT_ACK_IT_ACK, OMAP_MMU_IT_ACK);
-}
-
 #endif /* __MACH_OMAP1_MMU_H */