diff options
author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-19 14:00:57 +1100 |
---|---|---|
committer | Lachlan McIlroy <lachlan@sgi.com> | 2009-01-19 14:00:57 +1100 |
commit | 6c5200ce3c528a8f7695ee62f33ad84d8f84d444 (patch) | |
tree | b240465c2dadbe0366a5b66d60c4776be1b7670d /include/linux/input.h | |
parent | 9d87c3192d96ef9ac1cec8321538e9b35e90b5aa (diff) | |
parent | f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/input.h')
-rw-r--r-- | include/linux/input.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 9a6355f74db..1249a0c20a3 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -16,7 +16,7 @@ #include <sys/time.h> #include <sys/ioctl.h> #include <sys/types.h> -#include <asm/types.h> +#include <linux/types.h> #endif /* |