diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
| commit | e70049b9e74267dd47e1ffa62302073487afcb48 (patch) | |
| tree | 2cd000c0751ef31c9044b020d63f278cdf4f332d /fs/compat_ioctl.c | |
| parent | d18921a0e319ab512f8186b1b1142c7b8634c779 (diff) | |
| parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'fs/compat_ioctl.c')
| -rw-r--r-- | fs/compat_ioctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 763fe69ef351..4ea8a98b23df 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -1943,6 +1943,8 @@ ULONG_IOCTL(SET_BITMAP_FILE) | |||
| 1943 | /* Big K */ | 1943 | /* Big K */ |
| 1944 | COMPATIBLE_IOCTL(PIO_FONT) | 1944 | COMPATIBLE_IOCTL(PIO_FONT) |
| 1945 | COMPATIBLE_IOCTL(GIO_FONT) | 1945 | COMPATIBLE_IOCTL(GIO_FONT) |
| 1946 | COMPATIBLE_IOCTL(PIO_CMAP) | ||
| 1947 | COMPATIBLE_IOCTL(GIO_CMAP) | ||
| 1946 | ULONG_IOCTL(KDSIGACCEPT) | 1948 | ULONG_IOCTL(KDSIGACCEPT) |
| 1947 | COMPATIBLE_IOCTL(KDGETKEYCODE) | 1949 | COMPATIBLE_IOCTL(KDGETKEYCODE) |
| 1948 | COMPATIBLE_IOCTL(KDSETKEYCODE) | 1950 | COMPATIBLE_IOCTL(KDSETKEYCODE) |