diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-21 04:12:16 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-21 04:12:16 -0400 |
| commit | 4db25d496c09fdf094d52d11a90ae51f9ee473c6 (patch) | |
| tree | 77ab8003db1d6ccbcf3a9acafad26002fba37b63 /arch/x86/include/asm/pat.h | |
| parent | b8c193f88ebd8705b3e916532539031cd9fc0b4c (diff) | |
| parent | 8c31813f31cd4403b46802866949a95a6e8fa584 (diff) | |
Merge branch 'sh/stable-updates' into sh/for-2.6.30
Diffstat (limited to 'arch/x86/include/asm/pat.h')
| -rw-r--r-- | arch/x86/include/asm/pat.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/include/asm/pat.h b/arch/x86/include/asm/pat.h index 2cd07b9422f4..7af14e512f97 100644 --- a/arch/x86/include/asm/pat.h +++ b/arch/x86/include/asm/pat.h | |||
| @@ -18,9 +18,5 @@ extern int free_memtype(u64 start, u64 end); | |||
| 18 | 18 | ||
| 19 | extern int kernel_map_sync_memtype(u64 base, unsigned long size, | 19 | extern int kernel_map_sync_memtype(u64 base, unsigned long size, |
| 20 | unsigned long flag); | 20 | unsigned long flag); |
| 21 | extern void map_devmem(unsigned long pfn, unsigned long size, | ||
| 22 | struct pgprot vma_prot); | ||
| 23 | extern void unmap_devmem(unsigned long pfn, unsigned long size, | ||
| 24 | struct pgprot vma_prot); | ||
| 25 | 21 | ||
| 26 | #endif /* _ASM_X86_PAT_H */ | 22 | #endif /* _ASM_X86_PAT_H */ |