diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:49:18 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:49:18 -0500 |
| commit | ac67c6247361b3b8644b34e5301a46d5069c1373 (patch) | |
| tree | dd83147e304181e889eefa39e5056451031f4b5d /drivers/input/serio/i8042.h | |
| parent | c4c48d83e9ffb1c25cccd59d5ea9dda6ded01faf (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/input/serio/i8042.h')
| -rw-r--r-- | drivers/input/serio/i8042.h | 2 |
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" |