diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-08 12:24:00 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-08 12:24:00 +1100 |
| commit | efb2a278bc665d79d5f0764c453e5d6c3647e0e2 (patch) | |
| tree | 7c2682d642b71c279cff4b233f2d338d1130f1ff /fs | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | acc4854365766460d4367107a9f57153ddf229da (diff) | |
Merge remote branch 'fixes/fixes'
Diffstat (limited to 'fs')
| -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 6d55b61bfa79..0c2795148128 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -102,7 +102,6 @@ #include <linux/nbd.h> #include <linux/random.h> #include <linux/filter.h> -#include <linux/pktcdvd.h> #include <linux/hiddev.h> @@ -1126,8 +1125,6 @@ COMPATIBLE_IOCTL(PPGETMODE) COMPATIBLE_IOCTL(PPGETPHASE) COMPATIBLE_IOCTL(PPGETFLAGS) COMPATIBLE_IOCTL(PPSETFLAGS) -/* pktcdvd */ -COMPATIBLE_IOCTL(PACKET_CTRL_CMD) /* Big A */ /* sparc only */ /* Big Q for sound/OSS */ |