diff --git a/[refs] b/[refs]
index 7a0e5a5f23de..32e8acbc1852 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7de40c216c15c02c453f17b6c9ecee83f93790f1
+refs/heads/master: 549d0460bcbbf69791149725027b0036e6dc4d88
diff --git a/trunk/arch/arm/mach-s3c24a0/include/mach/io.h b/trunk/arch/arm/mach-s3c24a0/include/mach/io.h
deleted file mode 100644
index c163364773b3..000000000000
--- a/trunk/arch/arm/mach-s3c24a0/include/mach/io.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* arch/arm/mach-s3c24a0/include/mach/io.h
- *
- * Copyright 2008 Simtec Electronics
- *	Ben Dooks <ben-linux@fluff.org>
- *
- * IO access and mapping routines for the S3C24A0
- */
-
-#ifndef __ASM_ARM_ARCH_IO_H
-#define __ASM_ARM_ARCH_IO_H
-
-/* No current ISA/PCI bus support. */
-#define __io(a)		((void __iomem *)(a))
-#define __mem_pci(a)	(a)
-
-#endif