diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /include/linux/compat_ioctl.h | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'include/linux/compat_ioctl.h')
| -rw-r--r-- | include/linux/compat_ioctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/compat_ioctl.h b/include/linux/compat_ioctl.h index cfdb4f6a89d4..c26c3adcfacf 100644 --- a/include/linux/compat_ioctl.h +++ b/include/linux/compat_ioctl.h | |||
| @@ -131,6 +131,7 @@ COMPATIBLE_IOCTL(RUN_ARRAY) | |||
| 131 | COMPATIBLE_IOCTL(STOP_ARRAY) | 131 | COMPATIBLE_IOCTL(STOP_ARRAY) |
| 132 | COMPATIBLE_IOCTL(STOP_ARRAY_RO) | 132 | COMPATIBLE_IOCTL(STOP_ARRAY_RO) |
| 133 | COMPATIBLE_IOCTL(RESTART_ARRAY_RW) | 133 | COMPATIBLE_IOCTL(RESTART_ARRAY_RW) |
| 134 | COMPATIBLE_IOCTL(GET_BITMAP_FILE) | ||
| 134 | ULONG_IOCTL(SET_BITMAP_FILE) | 135 | ULONG_IOCTL(SET_BITMAP_FILE) |
| 135 | /* DM */ | 136 | /* DM */ |
| 136 | COMPATIBLE_IOCTL(DM_VERSION_32) | 137 | COMPATIBLE_IOCTL(DM_VERSION_32) |