diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-02-12 03:27:56 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-02-12 03:27:56 -0500 |
| commit | 41480ae7a383dcffa497decdd97b3cb2caaa18ec (patch) | |
| tree | f1e3afce2cbd0bbc544cd86a73e5b3093eb081c4 /include/linux/dvb/dmx.h | |
| parent | 508eb2ce222053e51e2243b7add8eeac85b1d250 (diff) | |
| parent | 34aeb43e2d3800f4d8f96feb9f1b49cd506679d5 (diff) | |
Merge branch 'sh/stable-updates'
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 402fb7a8d922..fef943738a24 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 |