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/bt8xx/dvb-bt8xx.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/bt8xx/dvb-bt8xx.h')
| -rw-r--r-- | drivers/media/dvb/bt8xx/dvb-bt8xx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/drivers/media/dvb/bt8xx/dvb-bt8xx.h index 9ec8e5bd6c1f..cf035a80361c 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.h +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.h | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include "nxt6000.h" | 35 | #include "nxt6000.h" |
| 36 | #include "cx24110.h" | 36 | #include "cx24110.h" |
| 37 | #include "or51211.h" | 37 | #include "or51211.h" |
| 38 | #include "lgdt330x.h" | ||
| 38 | 39 | ||
| 39 | struct dvb_bt8xx_card { | 40 | struct dvb_bt8xx_card { |
| 40 | struct semaphore lock; | 41 | struct semaphore lock; |