diff --git a/[refs] b/[refs]
index 6d0ad1739bff..88fc22906745 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbf35992e17334f9ae8b2ea35e795d0c264e57ef
+refs/heads/master: 5bdf67312e1ddc03cb29dad9bfe5b24988ee1c97
diff --git a/trunk/arch/arm/mach-s3c6400/include/mach/memory.h b/trunk/arch/arm/mach-s3c6400/include/mach/memory.h
index 38c381132f24..a3ac84a65480 100644
--- a/trunk/arch/arm/mach-s3c6400/include/mach/memory.h
+++ b/trunk/arch/arm/mach-s3c6400/include/mach/memory.h
@@ -15,7 +15,4 @@
 
 #define PHYS_OFFSET     UL(0x50000000)
 
-#define __virt_to_bus(x) __virt_to_phys(x)
-#define __bus_to_virt(x) __phys_to_virt(x)
-
 #endif