summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-15 19:01:48 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-15 19:01:48 +0300
commitf885b51967fb5f611c462841e5119853df00cc97 (patch)
tree29ba7f6eb9dd607980e63917e7f68e88578e7aca /include
parent5d5d80001df3fbd06bd2b8893b6e3847e38a12d6 (diff)
parentdfbe0d3b6be52596b5694b1bb75b19562e769021 (diff)
downloadlinux-f885b51967fb5f611c462841e5119853df00cc97.tar.xz
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix boot failure on POWER6 [POWERPC] Workaround for iommu page alignment
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/mmu-hash64.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-powerpc/mmu-hash64.h b/include/asm-powerpc/mmu-hash64.h
index 951e2487aa69..82328dec2b52 100644
--- a/include/asm-powerpc/mmu-hash64.h
+++ b/include/asm-powerpc/mmu-hash64.h
@@ -286,7 +286,6 @@ extern void hpte_init_iSeries(void);
extern void hpte_init_beat(void);
extern void hpte_init_beat_v3(void);
-extern void slb_shadow_clear_all(void);
extern void stabs_alloc(void);
extern void slb_initialize(void);
extern void slb_flush_and_rebolt(void);