diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
| commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
| tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /drivers/input/evdev.c | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
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 9f2352bd8348..a1e660e3531d 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
| @@ -157,7 +157,7 @@ struct input_event_compat { | |||
| 157 | # define COMPAT_TEST test_thread_flag(TIF_IA32) | 157 | # define COMPAT_TEST test_thread_flag(TIF_IA32) |
| 158 | #elif defined(CONFIG_IA64) | 158 | #elif defined(CONFIG_IA64) |
| 159 | # define COMPAT_TEST IS_IA32_PROCESS(ia64_task_regs(current)) | 159 | # define COMPAT_TEST IS_IA32_PROCESS(ia64_task_regs(current)) |
| 160 | #elif defined(CONFIG_ARCH_S390) | 160 | #elif defined(CONFIG_S390) |
| 161 | # define COMPAT_TEST test_thread_flag(TIF_31BIT) | 161 | # define COMPAT_TEST test_thread_flag(TIF_31BIT) |
| 162 | #elif defined(CONFIG_MIPS) | 162 | #elif defined(CONFIG_MIPS) |
| 163 | # define COMPAT_TEST (current->thread.mflags & MF_32BIT_ADDR) | 163 | # define COMPAT_TEST (current->thread.mflags & MF_32BIT_ADDR) |