diff options
| author | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2009-02-02 14:40:55 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2009-02-02 14:40:55 -0500 |
| commit | 8db0c5d5ef3ab99fe9e5151872b75f45c4282e3c (patch) | |
| tree | da9759151e00221c58cdd9f4de893c0b08753670 /include/linux/dvb/frontend.h | |
| parent | 1ad53a98c927a9b5b1b57288ac0edec562fbcf8d (diff) | |
| parent | 45c82b5a770be66845687a7d027c8b52946d59af (diff) | |
Merge branch 'master' of /home/shaggy/git/linus-clean/
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 55026b1a40bd..51c8d2d49e42 100644 --- a/include/linux/dvb/frontend.h +++ b/include/linux/dvb/frontend.h | |||
| @@ -26,8 +26,7 @@ | |||
| 26 | #ifndef _DVBFRONTEND_H_ | 26 | #ifndef _DVBFRONTEND_H_ |
| 27 | #define _DVBFRONTEND_H_ | 27 | #define _DVBFRONTEND_H_ |
| 28 | 28 | ||
| 29 | #include <asm/types.h> | 29 | #include <linux/types.h> |
| 30 | |||
| 31 | 30 | ||
| 32 | typedef enum fe_type { | 31 | typedef enum fe_type { |
| 33 | FE_QPSK, | 32 | FE_QPSK, |