diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
| commit | b981d8b3f5e008ff10d993be633ad00564fc22cd (patch) | |
| tree | e292dc07b22308912cf6a58354a608b9e5e8e1fd /drivers/input/evdev.c | |
| parent | b11d2127c4893a7315d1e16273bc8560049fa3ca (diff) | |
| parent | 2b9e0aae1d50e880c58d46788e5e3ebd89d75d62 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/macintosh/adbhid.c
Diffstat (limited to 'drivers/input/evdev.c')
| -rw-r--r-- | drivers/input/evdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index d404aa8680ea..27026f7d3c03 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
| @@ -312,7 +312,7 @@ struct input_event_compat { | |||
| 312 | #elif defined(CONFIG_S390) | 312 | #elif defined(CONFIG_S390) |
| 313 | # define COMPAT_TEST test_thread_flag(TIF_31BIT) | 313 | # define COMPAT_TEST test_thread_flag(TIF_31BIT) |
| 314 | #elif defined(CONFIG_MIPS) | 314 | #elif defined(CONFIG_MIPS) |
| 315 | # define COMPAT_TEST (current->thread.mflags & MF_32BIT_ADDR) | 315 | # define COMPAT_TEST test_thread_flag(TIF_32BIT_ADDR) |
| 316 | #else | 316 | #else |
| 317 | # define COMPAT_TEST test_thread_flag(TIF_32BIT) | 317 | # define COMPAT_TEST test_thread_flag(TIF_32BIT) |
| 318 | #endif | 318 | #endif |