diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-07 12:31:54 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-07 12:31:54 -0500 |
| commit | 673f8205914a12e928c65afbcd78ae748f78df53 (patch) | |
| tree | 38c60215646d079fab3bff812e094e914960c7ec /include/linux/hiddev.h | |
| parent | cf47b8f3d96b0b8b10b557444a28b3ca4024ff82 (diff) | |
| parent | ae1a25da8448271a99745da03100d5299575a269 (diff) | |
Merge branch 'linus' into core/locking
Conflicts:
fs/btrfs/locking.c
Diffstat (limited to 'include/linux/hiddev.h')
| -rw-r--r-- | include/linux/hiddev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/hiddev.h b/include/linux/hiddev.h index c760ae0eb6a1..bb6f58baf319 100644 --- a/include/linux/hiddev.h +++ b/include/linux/hiddev.h | |||
| @@ -27,6 +27,8 @@ | |||
| 27 | * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic | 27 | * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/types.h> | ||
| 31 | |||
| 30 | /* | 32 | /* |
| 31 | * The event structure itself | 33 | * The event structure itself |
| 32 | */ | 34 | */ |