diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:51:52 -0500 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:51:52 -0500 |
| commit | ed7b44af3517441ba46b84da13773d24809ffdd3 (patch) | |
| tree | 7064703c5d63d44700085cd701703457730bc06e /include/linux/dvb/dmx.h | |
| parent | a1a1415e5ea2d2241df208a7777a4f38aba9ed5a (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/dvb/dmx.h')
| -rw-r--r-- | include/linux/dvb/dmx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dvb/dmx.h b/include/linux/dvb/dmx.h index 402fb7a8d92..fef943738a2 100644 --- a/include/linux/dvb/dmx.h +++ b/include/linux/dvb/dmx.h | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #ifndef _DVBDMX_H_ | 24 | #ifndef _DVBDMX_H_ |
| 25 | #define _DVBDMX_H_ | 25 | #define _DVBDMX_H_ |
| 26 | 26 | ||
| 27 | #include <asm/types.h> | 27 | #include <linux/types.h> |
| 28 | #ifdef __KERNEL__ | 28 | #ifdef __KERNEL__ |
| 29 | #include <linux/time.h> | 29 | #include <linux/time.h> |
| 30 | #else | 30 | #else |