git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git]
/
include
/
asm-powerpc
/
mmu.h
diff --git
a/include/asm-powerpc/mmu.h
b/include/asm-powerpc/mmu.h
index 3a5ebe229af56763ec8956573d579161aad4e4cb..c3fc7a28e3cd0cb73dd245c727cf0b3d979ee082 100644
(file)
--- a/
include/asm-powerpc/mmu.h
+++ b/
include/asm-powerpc/mmu.h
@@
-238,7
+238,6
@@
extern int hash_huge_page(struct mm_struct *mm, unsigned long access,
unsigned long ea, unsigned long vsid, int local,
unsigned long trap);
-extern void htab_finish_init(void);
extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
unsigned long pstart, unsigned long mode,
int psize);