aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/i8042.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-23 13:11:50 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-23 13:11:50 -0500
commit8f43d8e1147406901b7d972d1b528d94def23b0e (patch)
tree8e0667ce322b79c6a9aade51dc9739f3dc9430fe /drivers/input/serio/i8042.h
parent7b3dad3d854654e470a598d361919ebdb858f37b (diff)
parent597d1f0622d21ffe54aceef8da9682e776f51cc2 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers/input/serio/i8042.h')
-rw-r--r--drivers/input/serio/i8042.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h
index 13835039a2a7..cbbf3842da5b 100644
--- a/drivers/input/serio/i8042.h
+++ b/drivers/input/serio/i8042.h
@@ -21,7 +21,7 @@
21#include "i8042-ip22io.h" 21#include "i8042-ip22io.h"
22#elif defined(CONFIG_PPC) 22#elif defined(CONFIG_PPC)
23#include "i8042-ppcio.h" 23#include "i8042-ppcio.h"
24#elif defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64) 24#elif defined(CONFIG_SPARC)
25#include "i8042-sparcio.h" 25#include "i8042-sparcio.h"
26#elif defined(CONFIG_X86) || defined(CONFIG_IA64) 26#elif defined(CONFIG_X86) || defined(CONFIG_IA64)
27#include "i8042-x86ia64io.h" 27#include "i8042-x86ia64io.h"