diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
| commit | 115b384cf87249d76adb0b21aca11ee22128927d (patch) | |
| tree | f39a2a54863e9d82d1196906f92c82ab5991c6af /include/asm-arm/io.h | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'include/asm-arm/io.h')
| -rw-r--r-- | include/asm-arm/io.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h index b3479fc1cc8f..bf7b9dea30f1 100644 --- a/include/asm-arm/io.h +++ b/include/asm-arm/io.h | |||
| @@ -291,5 +291,12 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr); | |||
| 291 | */ | 291 | */ |
| 292 | #define xlate_dev_kmem_ptr(p) p | 292 | #define xlate_dev_kmem_ptr(p) p |
| 293 | 293 | ||
| 294 | /* | ||
| 295 | * Register ISA memory and port locations for glibc iopl/inb/outb | ||
| 296 | * emulation. | ||
| 297 | */ | ||
| 298 | extern void register_isa_ports(unsigned int mmio, unsigned int io, | ||
| 299 | unsigned int io_shift); | ||
| 300 | |||
| 294 | #endif /* __KERNEL__ */ | 301 | #endif /* __KERNEL__ */ |
| 295 | #endif /* __ASM_ARM_IO_H */ | 302 | #endif /* __ASM_ARM_IO_H */ |