diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 09:30:40 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 09:30:40 -0400 |
| commit | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (patch) | |
| tree | 5bfcfadf2dd2d98c2ad251c96d7ee43a6903819a /include/asm-x86/io_32.h | |
| parent | a31863168660c6b6f6c7ffe05bb6a38e97803326 (diff) | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
Merge branch 'linus' into x86/header-guards
Conflicts:
include/asm-x86/gpio.h
include/asm-x86/ide.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/io_32.h')
| -rw-r--r-- | include/asm-x86/io_32.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/io_32.h b/include/asm-x86/io_32.h index d9d1e3f269a8..4f7d878bda18 100644 --- a/include/asm-x86/io_32.h +++ b/include/asm-x86/io_32.h | |||
| @@ -110,6 +110,8 @@ static inline void *phys_to_virt(unsigned long address) | |||
| 110 | */ | 110 | */ |
| 111 | extern void __iomem *ioremap_nocache(resource_size_t offset, unsigned long size); | 111 | extern void __iomem *ioremap_nocache(resource_size_t offset, unsigned long size); |
| 112 | extern void __iomem *ioremap_cache(resource_size_t offset, unsigned long size); | 112 | extern void __iomem *ioremap_cache(resource_size_t offset, unsigned long size); |
| 113 | extern void __iomem *ioremap_prot(resource_size_t offset, unsigned long size, | ||
| 114 | unsigned long prot_val); | ||
| 113 | 115 | ||
| 114 | /* | 116 | /* |
| 115 | * The default ioremap() behavior is non-cached: | 117 | * The default ioremap() behavior is non-cached: |