projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/vmaster-update' into topic/docbook-fix
[linux-2.6-block.git]
/
include
/
linux
/
input.h
diff --git
a/include/linux/input.h
b/include/linux/input.h
index adc13322d1d2a352b1e7a139f873e2b1e5ca78a1..6b28048fc56820152a1f95074b2721e285bab762 100644
(file)
--- 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
/*