diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 02:20:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 02:20:01 -0500 |
| commit | d669af9d5afb5bdb629f78d024b35e507465f570 (patch) | |
| tree | 711ab23d69098fa05973b69efbd0ae61cc7ff927 /drivers/media/video/msp3400.h | |
| parent | 2ddb55f091a9c74a297d72b50f8310c0c8ed7d1d (diff) | |
| parent | f87d09be8c2c270b83c2ad80d06206a7306e2fa9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/video/msp3400.h')
| -rw-r--r-- | drivers/media/video/msp3400.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/media/video/msp3400.h b/drivers/media/video/msp3400.h index 70a5ef8ba017..a9ac57d0700b 100644 --- a/drivers/media/video/msp3400.h +++ b/drivers/media/video/msp3400.h | |||
| @@ -6,14 +6,6 @@ | |||
| 6 | 6 | ||
| 7 | /* ---------------------------------------------------------------------- */ | 7 | /* ---------------------------------------------------------------------- */ |
| 8 | 8 | ||
| 9 | struct msp_matrix { | ||
| 10 | int input; | ||
| 11 | int output; | ||
| 12 | }; | ||
| 13 | |||
| 14 | /* ioctl for MSP_SET_MATRIX will have to be registered */ | ||
| 15 | #define MSP_SET_MATRIX _IOW('m',17,struct msp_matrix) | ||
| 16 | |||
| 17 | /* This macro is allowed for *constants* only, gcc must calculate it | 9 | /* This macro is allowed for *constants* only, gcc must calculate it |
| 18 | at compile time. Remember -- no floats in kernel mode */ | 10 | at compile time. Remember -- no floats in kernel mode */ |
| 19 | #define MSP_CARRIER(freq) ((int)((float)(freq / 18.432) * (1 << 24))) | 11 | #define MSP_CARRIER(freq) ((int)((float)(freq / 18.432) * (1 << 24))) |