summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/io.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-11 11:38:55 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-11 11:38:55 +0100
commit891393745aad5c5acdb01b6ce61c08d4cc064649 (patch)
tree7687b8b94c4bc4ec8d5f1106ff8ff4d557b2fabf /arch/x86/include/asm/io.h
parenta448720ca3248e8a7a426336885549d6e923fd8e (diff)
parent8e4921515c1a379539607eb443d51c30f4f7f338 (diff)
downloadblackbird-op-linux-891393745aad5c5acdb01b6ce61c08d4cc064649.tar.gz
blackbird-op-linux-891393745aad5c5acdb01b6ce61c08d4cc064649.zip
Merge commit 'v2.6.29-rc4' into x86/cleanups
Diffstat (limited to 'arch/x86/include/asm/io.h')
-rw-r--r--arch/x86/include/asm/io.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 975207c08b3e..76797f4783bb 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -99,7 +99,6 @@ extern void __iomem *ioremap_wc(unsigned long offset, unsigned long size);
* A boot-time mapping is currently limited to at most 16 pages.
*/
extern void early_ioremap_init(void);
-extern void early_ioremap_clear(void);
extern void early_ioremap_reset(void);
extern void __iomem *early_ioremap(unsigned long offset, unsigned long size);
extern void __iomem *early_memremap(unsigned long offset, unsigned long size);
OpenPOWER on IntegriCloud