diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-09-07 15:21:14 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 10:20:58 +0200 |
| commit | efc9eb20b2f5125642fc37a1dbabadc3ce5d321c (patch) | |
| tree | 47a6957ae34270b9a81d84b6306c933edf2e4fa8 /include/asm-x86 | |
| parent | be43d72835ba610e4af274f2d123b26f66f4f7ed (diff) | |
| download | op-kernel-dev-efc9eb20b2f5125642fc37a1dbabadc3ce5d321c.zip op-kernel-dev-efc9eb20b2f5125642fc37a1dbabadc3ce5d321c.tar.gz | |
x86: remove duplicate early_ioremap declarations
early_ioremap() is redeclared in several places; remove them.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86')
| -rw-r--r-- | include/asm-x86/io.h | 14 | ||||
| -rw-r--r-- | include/asm-x86/io_64.h | 3 |
2 files changed, 0 insertions, 17 deletions
diff --git a/include/asm-x86/io.h b/include/asm-x86/io.h index 72b7719..e091f39 100644 --- a/include/asm-x86/io.h +++ b/include/asm-x86/io.h @@ -5,20 +5,6 @@ #include <linux/compiler.h> -/* - * early_ioremap() and early_iounmap() are for temporary early boot-time - * mappings, before the real ioremap() is functional. - * A boot-time mapping is currently limited to at most 16 pages. - */ -#ifndef __ASSEMBLY__ -extern void early_ioremap_init(void); -extern void early_ioremap_clear(void); -extern void early_ioremap_reset(void); -extern void *early_ioremap(unsigned long offset, unsigned long size); -extern void early_iounmap(void *addr, unsigned long size); -extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys); -#endif - #define build_mmio_read(name, size, type, reg, barrier) \ static inline type name(const volatile void __iomem *addr) \ { type ret; asm volatile("mov" size " %1,%0":reg (ret) \ diff --git a/include/asm-x86/io_64.h b/include/asm-x86/io_64.h index 64429e9..ee6e086 100644 --- a/include/asm-x86/io_64.h +++ b/include/asm-x86/io_64.h @@ -165,9 +165,6 @@ static inline void *phys_to_virt(unsigned long address) #include <asm-generic/iomap.h> -extern void *early_ioremap(unsigned long addr, unsigned long size); -extern void early_iounmap(void *addr, unsigned long size); - /* * This one maps high address device memory and turns off caching for that area. * it's useful if some control registers are in such an area and write combining |
