diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 07:02:23 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 07:02:23 -0500 |
| commit | 8e818179eb9e8f9e44d8410dd2a25077d026a08e (patch) | |
| tree | 7d08afd30c95c04129c20693d974a18799caeb5a /fs/compat_ioctl.c | |
| parent | 742bd95ba96e19b3f7196c3a0834ebc17c8ba006 (diff) | |
| parent | ecc25fbd6b9e07b33895c61ddf84006b00f55d99 (diff) | |
Merge branch 'x86/core' into perfcounters/core
Conflicts:
arch/x86/kernel/apic/apic.c
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 9c6d815dd191..39bd4d38e889 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -1938,6 +1938,8 @@ ULONG_IOCTL(SET_BITMAP_FILE) | |||
| 1938 | /* Big K */ | 1938 | /* Big K */ |
| 1939 | COMPATIBLE_IOCTL(PIO_FONT) | 1939 | COMPATIBLE_IOCTL(PIO_FONT) |
| 1940 | COMPATIBLE_IOCTL(GIO_FONT) | 1940 | COMPATIBLE_IOCTL(GIO_FONT) |
| 1941 | COMPATIBLE_IOCTL(PIO_CMAP) | ||
| 1942 | COMPATIBLE_IOCTL(GIO_CMAP) | ||
| 1941 | ULONG_IOCTL(KDSIGACCEPT) | 1943 | ULONG_IOCTL(KDSIGACCEPT) |
| 1942 | COMPATIBLE_IOCTL(KDGETKEYCODE) | 1944 | COMPATIBLE_IOCTL(KDGETKEYCODE) |
| 1943 | COMPATIBLE_IOCTL(KDSETKEYCODE) | 1945 | COMPATIBLE_IOCTL(KDSETKEYCODE) |