diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /include/linux/compat_ioctl.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/linux/compat_ioctl.h')
| -rw-r--r-- | include/linux/compat_ioctl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/compat_ioctl.h b/include/linux/compat_ioctl.h index ae7dfb790df3..efb518f16bb3 100644 --- a/include/linux/compat_ioctl.h +++ b/include/linux/compat_ioctl.h | |||
| @@ -97,6 +97,10 @@ COMPATIBLE_IOCTL(BLKRRPART) | |||
| 97 | COMPATIBLE_IOCTL(BLKFLSBUF) | 97 | COMPATIBLE_IOCTL(BLKFLSBUF) |
| 98 | COMPATIBLE_IOCTL(BLKSECTSET) | 98 | COMPATIBLE_IOCTL(BLKSECTSET) |
| 99 | COMPATIBLE_IOCTL(BLKSSZGET) | 99 | COMPATIBLE_IOCTL(BLKSSZGET) |
| 100 | COMPATIBLE_IOCTL(BLKTRACESTART) | ||
| 101 | COMPATIBLE_IOCTL(BLKTRACESTOP) | ||
| 102 | COMPATIBLE_IOCTL(BLKTRACESETUP) | ||
| 103 | COMPATIBLE_IOCTL(BLKTRACETEARDOWN) | ||
| 100 | ULONG_IOCTL(BLKRASET) | 104 | ULONG_IOCTL(BLKRASET) |
| 101 | ULONG_IOCTL(BLKFRASET) | 105 | ULONG_IOCTL(BLKFRASET) |
| 102 | /* RAID */ | 106 | /* RAID */ |