diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
| commit | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (patch) | |
| tree | 8129b5907161bc6ae26deb3645ce1e280c5e1f51 /include/asm-x86/io_64.h | |
| parent | b2139aa0eec330c711c5a279db361e5ef1178e78 (diff) | |
| parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) | |
Merge commit 'v2.6.27-rc3' into x86/prototypes
Conflicts:
include/asm-x86/dma-mapping.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/io_64.h')
| -rw-r--r-- | include/asm-x86/io_64.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/io_64.h b/include/asm-x86/io_64.h index 1e271378afaf..080482acaffc 100644 --- a/include/asm-x86/io_64.h +++ b/include/asm-x86/io_64.h | |||
| @@ -175,6 +175,8 @@ extern void early_iounmap(void *addr, unsigned long size); | |||
| 175 | */ | 175 | */ |
| 176 | extern void __iomem *ioremap_nocache(resource_size_t offset, unsigned long size); | 176 | extern void __iomem *ioremap_nocache(resource_size_t offset, unsigned long size); |
| 177 | extern void __iomem *ioremap_cache(resource_size_t offset, unsigned long size); | 177 | extern void __iomem *ioremap_cache(resource_size_t offset, unsigned long size); |
| 178 | extern void __iomem *ioremap_prot(resource_size_t offset, unsigned long size, | ||
| 179 | unsigned long prot_val); | ||
| 178 | 180 | ||
| 179 | /* | 181 | /* |
| 180 | * The default ioremap() behavior is non-cached: | 182 | * The default ioremap() behavior is non-cached: |