Merge branch 'x86/core' into core/percpu

[mv-sheeva.git] / fs / compat_ioctl.c

diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 9c6d815dd1918b42640b4819393ac056b21da17f..39bd4d38e889878632b786b17a3951fa0aa2284a 100644 (file)
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -1938,6 +1938,8 @@ ULONG_IOCTL(SET_BITMAP_FILE)
 /* Big K */
 COMPATIBLE_IOCTL(PIO_FONT)
 COMPATIBLE_IOCTL(GIO_FONT)
+COMPATIBLE_IOCTL(PIO_CMAP)
+COMPATIBLE_IOCTL(GIO_CMAP)
 ULONG_IOCTL(KDSIGACCEPT)
 COMPATIBLE_IOCTL(KDGETKEYCODE)
 COMPATIBLE_IOCTL(KDSETKEYCODE)