diff options
| author | Len Brown <len.brown@intel.com> | 2012-04-06 21:48:59 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-04-06 21:48:59 -0400 |
| commit | eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c (patch) | |
| tree | 369b9c91a6d808944f07d2290fec6f9fe2731904 /include/linux/cdrom.h | |
| parent | ee01e663373343c63e0e3d364d09f6155378dbcc (diff) | |
| parent | aaef292acf3a78d9c0bb6fb72226077d286b45d7 (diff) | |
Merge branches 'idle-fix' and 'misc' into release
Diffstat (limited to 'include/linux/cdrom.h')
| -rw-r--r-- | include/linux/cdrom.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h index 7c48029dffe6..dfd7f187c351 100644 --- a/include/linux/cdrom.h +++ b/include/linux/cdrom.h | |||
| @@ -910,7 +910,6 @@ struct mode_page_header { | |||
| 910 | 910 | ||
| 911 | #ifdef __KERNEL__ | 911 | #ifdef __KERNEL__ |
| 912 | #include <linux/fs.h> /* not really needed, later.. */ | 912 | #include <linux/fs.h> /* not really needed, later.. */ |
| 913 | #include <linux/device.h> | ||
| 914 | #include <linux/list.h> | 913 | #include <linux/list.h> |
| 915 | 914 | ||
| 916 | struct packet_command | 915 | struct packet_command |