summaryrefslogtreecommitdiff
path: root/drivers/s390/char/tape_class.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-09 22:55:17 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-09 22:55:17 +0400
commitb675b3667f6729dcd1036a2a129b35445947f905 (patch)
tree0d58791e9063d3ca2c352da6f3e7df2bdb876f9d /drivers/s390/char/tape_class.h
parent104a5f3cad8f2f27cadbdf0029400ecd9e17ccc0 (diff)
parent192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff)
downloadlinux-b675b3667f6729dcd1036a2a129b35445947f905.tar.xz
Merge commit 'v3.3-rc6' into next
Diffstat (limited to 'drivers/s390/char/tape_class.h')
-rw-r--r--drivers/s390/char/tape_class.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/char/tape_class.h b/drivers/s390/char/tape_class.h
index 9e32780c317f..ba2092f741d5 100644
--- a/drivers/s390/char/tape_class.h
+++ b/drivers/s390/char/tape_class.h
@@ -14,7 +14,6 @@
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/major.h>
-#include <linux/kobj_map.h>
#include <linux/cdev.h>
#include <linux/device.h>