diff --git a/[refs] b/[refs]
index 3f2f8be1eed5..b0a561bdd9c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1d7ef70a71eb54fb389a9a411d331661be73056
+refs/heads/master: edf83015fcbff8976b75b42b565a77e9d450c567
diff --git a/trunk/drivers/char/mem.c b/trunk/drivers/char/mem.c
index 850a78c9c4bc..f182752fe918 100644
--- a/trunk/drivers/char/mem.c
+++ b/trunk/drivers/char/mem.c
@@ -35,10 +35,6 @@
 # include <linux/efi.h>
 #endif
 
-#if defined(CONFIG_S390_TAPE) && defined(CONFIG_S390_TAPE_CHAR)
-extern void tapechar_init(void);
-#endif
-
 /*
  * Architectures vary in how they handle caching for addresses
  * outside of main memory.