Merge git://git.infradead.org/mtd-2.6

[linux-2.6] / include / asm-arm / pgtable-nommu.h

diff --git a/include/asm-arm/pgtable-nommu.h b/include/asm-arm/pgtable-nommu.h
index 1cf14d243e82a6630a3dcebe6748ca0117f0881b..33c83dd879654aa5e3c83f18b4ad022a1603ac3a 100644 (file)
--- a/include/asm-arm/pgtable-nommu.h
+++ b/include/asm-arm/pgtable-nommu.h
@@ -74,7 +74,6 @@ static inline int pte_file(pte_t pte) { return 0; }
  * These would be in other places but having them here reduces the diffs.
  */
 extern unsigned int kobjsize(const void *objp);
-extern int is_in_rom(unsigned long);
 
 /*
  * No page table caches to initialise.
@@ -103,6 +102,7 @@ extern int is_in_rom(unsigned long);
 #define v4wb_tlb_fns   (0)
 #define v4wbi_tlb_fns  (0)
 #define v6wbi_tlb_fns  (0)
+#define v7wbi_tlb_fns  (0)
 
 #define v3_user_fns    (0)
 #define v4_user_fns    (0)