diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
| commit | b981d8b3f5e008ff10d993be633ad00564fc22cd (patch) | |
| tree | e292dc07b22308912cf6a58354a608b9e5e8e1fd /include/linux/dvb/video.h | |
| parent | b11d2127c4893a7315d1e16273bc8560049fa3ca (diff) | |
| parent | 2b9e0aae1d50e880c58d46788e5e3ebd89d75d62 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/macintosh/adbhid.c
Diffstat (limited to 'include/linux/dvb/video.h')
| -rw-r--r-- | include/linux/dvb/video.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h index 93e4c3a6d190..50839fe9e39e 100644 --- a/include/linux/dvb/video.h +++ b/include/linux/dvb/video.h | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #ifdef __KERNEL__ | 29 | #ifdef __KERNEL__ |
| 30 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 31 | #else | 31 | #else |
| 32 | #include <asm/types.h> | ||
| 32 | #include <stdint.h> | 33 | #include <stdint.h> |
| 33 | #include <time.h> | 34 | #include <time.h> |
| 34 | #endif | 35 | #endif |