diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-01 14:20:58 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-01 14:20:58 -0700 |
| commit | dde3ada3d0069855eeb353707b2b0f946191cfd6 (patch) | |
| tree | bdc2d358f8dc7fc29000149ebc4db949934b15b2 /fs | |
| parent | 5e056ef4ddeb6129f6bb170f2c26b8f370bbcda7 (diff) | |
| parent | fb4f552e895cec29934d94a99cbd1f1f00448a88 (diff) | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.7 merge window.
Diffstat (limited to 'fs')
| -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 debdfe0fc80..edd4ab67cd1 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -897,6 +897,8 @@ COMPATIBLE_IOCTL(KDGKBSENT) COMPATIBLE_IOCTL(KDSKBSENT) COMPATIBLE_IOCTL(KDGKBDIACR) COMPATIBLE_IOCTL(KDSKBDIACR) +COMPATIBLE_IOCTL(KDGKBDIACRUC) +COMPATIBLE_IOCTL(KDSKBDIACRUC) COMPATIBLE_IOCTL(KDKBDREP) COMPATIBLE_IOCTL(KDGKBLED) COMPATIBLE_IOCTL(KDGETLED) |