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/dvb/b2c2/flexcop-reg.h | |
| 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/dvb/b2c2/flexcop-reg.h')
| -rw-r--r-- | drivers/media/dvb/b2c2/flexcop-reg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop-reg.h b/drivers/media/dvb/b2c2/flexcop-reg.h index 4ae1eb5bfe98..23cc6431e2b8 100644 --- a/drivers/media/dvb/b2c2/flexcop-reg.h +++ b/drivers/media/dvb/b2c2/flexcop-reg.h | |||
| @@ -26,6 +26,7 @@ typedef enum { | |||
| 26 | FC_SKY, | 26 | FC_SKY, |
| 27 | FC_SKY_OLD, | 27 | FC_SKY_OLD, |
| 28 | FC_CABLE, | 28 | FC_CABLE, |
| 29 | FC_AIR_ATSC3, | ||
| 29 | } flexcop_device_type_t; | 30 | } flexcop_device_type_t; |
| 30 | 31 | ||
| 31 | typedef enum { | 32 | typedef enum { |