Merge tag 'xceiv-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi...

[~andy/linux] / include / linux / cdrom.h

diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
index 7c48029dffe6fa93b349e8a1aa8c5775694aa6fa..dfd7f187c351440d2ffa81050e46ed2602877f73 100644 (file)
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
@@ -910,7 +910,6 @@ struct mode_page_header {
 
 #ifdef __KERNEL__
 #include <linux/fs.h>          /* not really needed, later.. */
-#include <linux/device.h>
 #include <linux/list.h>
 
 struct packet_command