summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-01 10:14:46 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-01 10:14:46 -0800
commitd03ab7ff335b7fbf48d0fd28ead5d7957798510b (patch)
tree5a1080b6f51a51fd515a61c518d46f7f2676c139 /drivers
parent8098a7ef8946169cf8ffeb6f4d8130fc3651192e (diff)
parent4d86e1b18d6de8446aa424b615b34e436d42c241 (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] wrong attribute of HUB chip written in uv_setup() [IA64] remove trailing space in messages [IA64] use asm-generic/scatterlist.h [IA64] build arch/ia64/kernel/acpi-ext.o when CONFIG_ACPI [IA64] Only build arch/ia64/kernel/acpi.o when CONFIG_ACPI [IA64] Remove COMPAT_IA32 support
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/input-compat.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/input-compat.h b/drivers/input/input-compat.h
index 47cd9eaee66..4d8ea32e8a0 100644
--- a/drivers/input/input-compat.h
+++ b/drivers/input/input-compat.h
@@ -21,8 +21,6 @@
you why the ifdefs are needed? Think about it again. -AK */
#ifdef CONFIG_X86_64
# define INPUT_COMPAT_TEST is_compat_task()
-#elif defined(CONFIG_IA64)
-# define INPUT_COMPAT_TEST IS_IA32_PROCESS(task_pt_regs(current))
#elif defined(CONFIG_S390)
# define INPUT_COMPAT_TEST test_thread_flag(TIF_31BIT)
#elif defined(CONFIG_MIPS)