diff --git a/[refs] b/[refs]
index 3947ea4189ec..00e02c5da722 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfe3349b516df011dcf6462b0fd748a6f5c2e8af
+refs/heads/master: f3d1263e81daf2be1353baf1ad3f6e25d135f2c5
diff --git a/trunk/arch/s390/power/Makefile b/trunk/arch/s390/power/Makefile
index 973bb45a8fec..ee2f279beff0 100644
--- a/trunk/arch/s390/power/Makefile
+++ b/trunk/arch/s390/power/Makefile
@@ -4,5 +4,4 @@
 
 obj-$(CONFIG_HIBERNATION) += suspend.o
 obj-$(CONFIG_HIBERNATION) += swsusp.o
-obj-$(CONFIG_HIBERNATION) += swsusp_64.o
 obj-$(CONFIG_HIBERNATION) += swsusp_asm64.o
diff --git a/trunk/arch/s390/power/swsusp_64.c b/trunk/arch/s390/power/swsusp_64.c
deleted file mode 100644
index 9516a517d72f..000000000000
--- a/trunk/arch/s390/power/swsusp_64.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Support for suspend and resume on s390
- *
- * Copyright IBM Corp. 2009
- *
- * Author(s): Hans-Joachim Picht <hans@linux.vnet.ibm.com>
- *
- */
-
-#include <asm/system.h>
-#include <linux/interrupt.h>
-
-void do_after_copyback(void)
-{
-	mb();
-}
-