diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /drivers/media/video/tea5767.c | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/media/video/tea5767.c')
| -rw-r--r-- | drivers/media/video/tea5767.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/tea5767.c b/drivers/media/video/tea5767.c index 38bf50943798..a9375ef05de1 100644 --- a/drivers/media/video/tea5767.c +++ b/drivers/media/video/tea5767.c | |||
| @@ -117,10 +117,10 @@ | |||
| 117 | #define TEA5767_RESERVED_MASK 0xff | 117 | #define TEA5767_RESERVED_MASK 0xff |
| 118 | 118 | ||
| 119 | enum tea5767_xtal_freq { | 119 | enum tea5767_xtal_freq { |
| 120 | TEA5767_LOW_LO_32768 = 0, | 120 | TEA5767_LOW_LO_32768 = 0, |
| 121 | TEA5767_HIGH_LO_32768 = 1, | 121 | TEA5767_HIGH_LO_32768 = 1, |
| 122 | TEA5767_LOW_LO_13MHz = 2, | 122 | TEA5767_LOW_LO_13MHz = 2, |
| 123 | TEA5767_HIGH_LO_13MHz = 3, | 123 | TEA5767_HIGH_LO_13MHz = 3, |
| 124 | }; | 124 | }; |
| 125 | 125 | ||
| 126 | 126 | ||