diff --git a/[refs] b/[refs]
index 20814a3f9b2a..5521cd7611be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bbe486b361b317ac7103378ed3d1aab4779715e
+refs/heads/master: ffc45571dfb4b70e7eda8d97f64a05f5e5a992ac
diff --git a/trunk/include/asm-ia64/io.h b/trunk/include/asm-ia64/io.h
index 43bfff6c6b87..855c30af72a9 100644
--- a/trunk/include/asm-ia64/io.h
+++ b/trunk/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:
  */