diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /include/linux/irda.h | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'include/linux/irda.h')
| -rw-r--r-- | include/linux/irda.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/irda.h b/include/linux/irda.h index 28f88ecba344..00bdad0e8515 100644 --- a/include/linux/irda.h +++ b/include/linux/irda.h | |||
| @@ -25,6 +25,8 @@ | |||
| 25 | #ifndef KERNEL_IRDA_H | 25 | #ifndef KERNEL_IRDA_H |
| 26 | #define KERNEL_IRDA_H | 26 | #define KERNEL_IRDA_H |
| 27 | 27 | ||
| 28 | #include <linux/types.h> | ||
| 29 | |||
| 28 | /* Please do *not* add any #include in this file, this file is | 30 | /* Please do *not* add any #include in this file, this file is |
| 29 | * included as-is in user space. | 31 | * included as-is in user space. |
| 30 | * Please fix the calling file to properly included needed files before | 32 | * Please fix the calling file to properly included needed files before |