diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-07 18:31:54 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-07 18:31:54 +0100 |
| commit | 673f8205914a12e928c65afbcd78ae748f78df53 (patch) | |
| tree | 38c60215646d079fab3bff812e094e914960c7ec /include/linux/dvb/frontend.h | |
| parent | cf47b8f3d96b0b8b10b557444a28b3ca4024ff82 (diff) | |
| parent | ae1a25da8448271a99745da03100d5299575a269 (diff) | |
Merge branch 'linus' into core/locking
Conflicts:
fs/btrfs/locking.c
Diffstat (limited to 'include/linux/dvb/frontend.h')
| -rw-r--r-- | include/linux/dvb/frontend.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h index 55026b1a40b..51c8d2d49e4 100644 --- a/include/linux/dvb/frontend.h +++ b/include/linux/dvb/frontend.h @@ -26,8 +26,7 @@ #ifndef _DVBFRONTEND_H_ #define _DVBFRONTEND_H_ -#include <asm/types.h> - +#include <linux/types.h> typedef enum fe_type { FE_QPSK, |