diff options
Diffstat (limited to 'drivers/media/video/bt8xx')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-cards.c | 1 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttvp.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index 5b4d45654d8e..de14818d5cc4 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c | |||
@@ -25,7 +25,6 @@ | |||
25 | 25 | ||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <linux/config.h> | ||
29 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
30 | #include <linux/module.h> | 29 | #include <linux/module.h> |
31 | #include <linux/moduleparam.h> | 30 | #include <linux/moduleparam.h> |
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h index d2956010f763..311c4c541e01 100644 --- a/drivers/media/video/bt8xx/bttvp.h +++ b/drivers/media/video/bt8xx/bttvp.h | |||
@@ -360,7 +360,7 @@ struct bttv { | |||
360 | int mbox_csel; | 360 | int mbox_csel; |
361 | 361 | ||
362 | /* risc memory management data | 362 | /* risc memory management data |
363 | - must aquire s_lock before changing these | 363 | - must acquire s_lock before changing these |
364 | - only the irq handler is supported to touch top + bottom + vcurr */ | 364 | - only the irq handler is supported to touch top + bottom + vcurr */ |
365 | struct btcx_riscmem main; | 365 | struct btcx_riscmem main; |
366 | struct bttv_buffer *screen; /* overlay */ | 366 | struct bttv_buffer *screen; /* overlay */ |