diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /include/asm-powerpc/mmu.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/asm-powerpc/mmu.h')
| -rw-r--r-- | include/asm-powerpc/mmu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-powerpc/mmu.h b/include/asm-powerpc/mmu.h index b0b9a3f8cdc2..31f721994bd8 100644 --- a/include/asm-powerpc/mmu.h +++ b/include/asm-powerpc/mmu.h | |||
| @@ -236,7 +236,6 @@ extern void htab_initialize_secondary(void); | |||
| 236 | extern void hpte_init_native(void); | 236 | extern void hpte_init_native(void); |
| 237 | extern void hpte_init_lpar(void); | 237 | extern void hpte_init_lpar(void); |
| 238 | extern void hpte_init_iSeries(void); | 238 | extern void hpte_init_iSeries(void); |
| 239 | extern void mm_init_ppc64(void); | ||
| 240 | 239 | ||
| 241 | extern long pSeries_lpar_hpte_insert(unsigned long hpte_group, | 240 | extern long pSeries_lpar_hpte_insert(unsigned long hpte_group, |
| 242 | unsigned long va, unsigned long prpn, | 241 | unsigned long va, unsigned long prpn, |