diff options
author | Steve French <sfrench@us.ibm.com> | 2008-03-11 19:15:41 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-03-11 19:15:41 +0000 |
commit | 5b4d4771e2a56671c7f1c94edda427a1e3d6f111 (patch) | |
tree | 58718288a28cca121a94b681a7865473a10dfd64 /drivers/input/serio/i8042.h | |
parent | 55f78e1771f0886162edd441dd4f39c287779de2 (diff) | |
parent | baadac8b10c5ac15ce3d26b68fa266c8889b163f (diff) | |
download | linux-3.10-5b4d4771e2a56671c7f1c94edda427a1e3d6f111.tar.gz linux-3.10-5b4d4771e2a56671c7f1c94edda427a1e3d6f111.tar.bz2 linux-3.10-5b4d4771e2a56671c7f1c94edda427a1e3d6f111.zip |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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 dd22d91f8b3..c972e5d03a3 100644 --- a/drivers/input/serio/i8042.h +++ b/drivers/input/serio/i8042.h @@ -16,7 +16,7 @@ #if defined(CONFIG_MACH_JAZZ) #include "i8042-jazzio.h" -#elif defined(CONFIG_SGI_IP22) +#elif defined(CONFIG_SGI_HAS_I8042) #include "i8042-ip22io.h" #elif defined(CONFIG_PPC) #include "i8042-ppcio.h" |