diff options
| author | David Teigland <teigland@redhat.com> | 2006-01-18 04:14:51 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-01-18 04:14:51 -0500 |
| commit | 2ff4782374dde5e3d76daf8a82eae396c0f76567 (patch) | |
| tree | 42cc821174a3f3f410895fce16741948a1103e66 /drivers/media/video/msp3400.h | |
| parent | cd1344fe322cd9d95b2c0f011d6766677cfcb29b (diff) | |
| parent | 7eb9b2f56c9812d03ac63031869bcc42151067b1 (diff) | |
Merge branch 'master'
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))) |