aboutsummaryrefslogtreecommitdiff
path: root/include/asm-ia64/io.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-18 17:49:19 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-18 17:49:19 -0700
commit3bee9df0ab55add6f8df92267a8a3d9d339cce08 (patch)
tree0957c90aaba3918b820d26f27ea6c2a710ed08e5 /include/asm-ia64/io.h
parent73ed9a86cd77b6a3b46beec8d353ac3b0d4f50c1 (diff)
parent9b3377f9921766b6193861d0e3194854b1d765fe (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Count resched interrupts [IA64] remove unused acpi_kbd_controller_present, acpi_legacy_devices [IA64] update sn2_defconfig [IA64] reformat pal.S to fit in 80 columns, fix typos [IA64] remove unused PAL_CALL_IC_OFF [IA64] - Allow IPIs in timer loop [IA64] move ioremap/ioremap_nocache under __KERNEL__ [IA64] perfmon fix for global IRQ fix
Diffstat (limited to 'include/asm-ia64/io.h')
-rw-r--r--include/asm-ia64/io.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ia64/io.h b/include/asm-ia64/io.h
index 43bfff6c6b8..855c30af72a 100644
--- a/include/asm-ia64/io.h
+++ b/include/asm-ia64/io.h
@@ -417,6 +417,8 @@ __writeq (unsigned long val, volatile void __iomem *addr)
# define outl_p outl
#endif
+# ifdef __KERNEL__
+
extern void __iomem * ioremap(unsigned long offset, unsigned long size);
extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size);
@@ -430,8 +432,6 @@ iounmap (volatile void __iomem *addr)
#define dmi_iounmap(x,l) iounmap(x)
#define dmi_alloc(l) kmalloc(l, GFP_ATOMIC)
-# ifdef __KERNEL__
-
/*
* String version of IO memory access ops:
*/