diff --git a/[refs] b/[refs]
index d32899ad9305..e92f4cd35180 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c80773e5a24df5f0604ed796b56edd8a14dbcce7
+refs/heads/master: 0e37b0cbb8edf64dc87ae95831c177db6c6d3b5c
diff --git a/trunk/drivers/s390/char/tape.h b/trunk/drivers/s390/char/tape.h
index c06be6cc2fc3..ea664dd4f56d 100644
--- a/trunk/drivers/s390/char/tape.h
+++ b/trunk/drivers/s390/char/tape.h
@@ -15,7 +15,6 @@
 #include <asm/ccwdev.h>
 #include <asm/debug.h>
 #include <asm/idals.h>
-#include <linux/blkdev.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mtio.h>
diff --git a/trunk/drivers/s390/char/tape_std.h b/trunk/drivers/s390/char/tape_std.h
index c5816ad9ed7d..8c760c036832 100644
--- a/trunk/drivers/s390/char/tape_std.h
+++ b/trunk/drivers/s390/char/tape_std.h
@@ -100,11 +100,7 @@ struct tape_request *tape_std_read_block(struct tape_device *, size_t);
 void tape_std_read_backward(struct tape_device *device,
 			    struct tape_request *request);
 struct tape_request *tape_std_write_block(struct tape_device *, size_t);
-struct tape_request *tape_std_bread(struct tape_device *, struct request *);
-void tape_std_free_bread(struct tape_request *);
 void tape_std_check_locate(struct tape_device *, struct tape_request *);
-struct tape_request *tape_std_bwrite(struct request *,
-				     struct tape_device *, int);
 
 /* Some non-mtop commands. */
 int tape_std_assign(struct tape_device *);