aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-06 21:31:43 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-06 21:31:43 -0400
commit4a2a4df7b6db25df8f3d5cc6dd0b096119359d92 (patch)
tree87a5985965c75a9184ad4bbec393ad2d66c54948 /include
parentf27eb3afe87bd4b3fe919a6b7bf364f577ccee3b (diff)
parent6e7d934060559454f161b3cf7cc5b7a5926e71d6 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] rpc: update defconfig [ARM] pata_icside: fix the FIXMEs [ARM] 4542/1: AT91: include atmel_lcdc.h in at91sam926{1,3}_devices.c [ARM] 4541/1: iop: defconfig updates [ARM] 4531/1: remove is_in_rom() protptype
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/pgtable-nommu.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-arm/pgtable-nommu.h b/include/asm-arm/pgtable-nommu.h
index b186bc820e30..33c83dd87965 100644
--- 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; }
74 * These would be in other places but having them here reduces the diffs. 74 * These would be in other places but having them here reduces the diffs.
75 */ 75 */
76extern unsigned int kobjsize(const void *objp); 76extern unsigned int kobjsize(const void *objp);
77extern int is_in_rom(unsigned long);
78 77
79/* 78/*
80 * No page table caches to initialise. 79 * No page table caches to initialise.