diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-06 21:29:25 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-06 21:29:25 -0400 |
| commit | 1ed31d6db90d51010545921e59d369d2f92b7ac2 (patch) | |
| tree | 358a0b346bc8135cd5e53700eb44308b1a7c8c5b /fs/compat_ioctl.c | |
| parent | ceba1abcb00b0ef0b1efcd715285f6e05523edef (diff) | |
| parent | 722154e4cacf015161efe60009ae9be23d492296 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'fs/compat_ioctl.c')
| -rw-r--r-- | fs/compat_ioctl.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index c32a1b6a856b..641640dc7ae5 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -102,7 +102,6 @@ | |||
| 102 | #include <linux/nbd.h> | 102 | #include <linux/nbd.h> |
| 103 | #include <linux/random.h> | 103 | #include <linux/random.h> |
| 104 | #include <linux/filter.h> | 104 | #include <linux/filter.h> |
| 105 | #include <linux/pktcdvd.h> | ||
| 106 | 105 | ||
| 107 | #include <linux/hiddev.h> | 106 | #include <linux/hiddev.h> |
| 108 | 107 | ||
| @@ -1126,8 +1125,6 @@ COMPATIBLE_IOCTL(PPGETMODE) | |||
| 1126 | COMPATIBLE_IOCTL(PPGETPHASE) | 1125 | COMPATIBLE_IOCTL(PPGETPHASE) |
| 1127 | COMPATIBLE_IOCTL(PPGETFLAGS) | 1126 | COMPATIBLE_IOCTL(PPGETFLAGS) |
| 1128 | COMPATIBLE_IOCTL(PPSETFLAGS) | 1127 | COMPATIBLE_IOCTL(PPSETFLAGS) |
| 1129 | /* pktcdvd */ | ||
| 1130 | COMPATIBLE_IOCTL(PACKET_CTRL_CMD) | ||
| 1131 | /* Big A */ | 1128 | /* Big A */ |
| 1132 | /* sparc only */ | 1129 | /* sparc only */ |
| 1133 | /* Big Q for sound/OSS */ | 1130 | /* Big Q for sound/OSS */ |