diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-02-03 15:19:23 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-02-03 15:19:23 +0000 |
| commit | e1f81c8a417be466e85a38b61679aa6860ec7331 (patch) | |
| tree | 749815f74bfad330e83560a10fd5da5fc4d8c765 /include/linux/dvb/dmx.h | |
| parent | 0e2bedaa394f74fa9f75ee937488c33d90039b5a (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
| download | kernel-crypto-e1f81c8a417be466e85a38b61679aa6860ec7331.tar.gz kernel-crypto-e1f81c8a417be466e85a38b61679aa6860ec7331.tar.xz kernel-crypto-e1f81c8a417be466e85a38b61679aa6860ec7331.zip | |
Merge branch 'master' of /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 @@ #ifndef _DVBDMX_H_ #define _DVBDMX_H_ -#include <asm/types.h> +#include <linux/types.h> #ifdef __KERNEL__ #include <linux/time.h> #else |