diff --git a/[refs] b/[refs]
index 4cf62970cc06..c3d4fb3ed293 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74af1c227cf17caff3bb8c6547858655a473a39b
+refs/heads/master: 6f4c7e39cb769addf047de8ec395a200cc6eec94
diff --git a/trunk/include/asm-arm/io.h b/trunk/include/asm-arm/io.h
index ae999fd5dc67..288f76b166d0 100644
--- a/trunk/include/asm-arm/io.h
+++ b/trunk/include/asm-arm/io.h
@@ -75,14 +75,6 @@ extern void __readwrite_bug(const char *fn);
  */
 #include <asm/arch/io.h>
 
-#ifdef __io_pci
-#warning machine class uses buggy __io_pci
-#endif
-#if defined(__arch_putb) || defined(__arch_putw) || defined(__arch_putl) || \
-    defined(__arch_getb) || defined(__arch_getw) || defined(__arch_getl)
-#warning machine class uses old __arch_putw or __arch_getw
-#endif
-
 /*
  *  IO port access primitives
  *  -------------------------