diff --git a/[refs] b/[refs]
index 788cefcccc40..97ab974b993f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78759757dff4ba9a2564daad1fc8e7f051080cd1
+refs/heads/master: 058f5fdfd9953e7f856285b72f1c652683d5d19b
diff --git a/trunk/include/asm-cris/io.h b/trunk/include/asm-cris/io.h
index d196dd6b2df3..b87ce63f531f 100644
--- a/trunk/include/asm-cris/io.h
+++ b/trunk/include/asm-cris/io.h
@@ -122,8 +122,8 @@ static inline void writel(unsigned int b, volatile void __iomem *addr)
 #define memcpy_toio(a,b,c)	memcpy((void *)(a),(b),(c))
 
 
-/* The following is junk needed for the arch-independent code but which
- * we never use in the CRIS port
+/* I/O port access. Normally there is no I/O space on CRIS but when
+ * Cardbus/PCI is enabled the request is passed through the bridge.
  */
 
 #define IO_SPACE_LIMIT 0xffff