diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-19 13:03:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-19 13:03:46 -0300 |
| commit | 9f815c2bf8f74ca4554fa573947cdede3848857e (patch) | |
| tree | 78041194ad15effe133774edb373ddc886aa980b /linux/drivers/media | |
| parent | ded9757de77adb99448ab46d12602aad60d3a737 (diff) | |
| download | mediapointer-dvb-s2-9f815c2bf8f74ca4554fa573947cdede3848857e.tar.gz mediapointer-dvb-s2-9f815c2bf8f74ca4554fa573947cdede3848857e.tar.bz2 | |
Several other backports from kernel to v4l/dvb tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttvp.h | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/usbvideo/usbvideo.h | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/v4l2-common.c | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h index 2d3178df5..43526b073 100644 --- a/linux/drivers/media/video/bt8xx/bttvp.h +++ b/linux/drivers/media/video/bt8xx/bttvp.h @@ -382,7 +382,7 @@ struct bttv { int mbox_csel; /* risc memory management data - - must aquire s_lock before changing these + - must acquire s_lock before changing these - only the irq handler is supported to touch top + bottom + vcurr */ struct btcx_riscmem main; struct bttv_buffer *screen; /* overlay */ diff --git a/linux/drivers/media/video/usbvideo/usbvideo.h b/linux/drivers/media/video/usbvideo/usbvideo.h index d5bb0c747..aaafce2b5 100644 --- a/linux/drivers/media/video/usbvideo/usbvideo.h +++ b/linux/drivers/media/video/usbvideo/usbvideo.h @@ -16,7 +16,6 @@ #ifndef usbvideo_h #define usbvideo_h -#include <linux/config.h> #include "compat.h" #include <linux/videodev.h> #include <media/v4l2-common.h> diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c index 96c778596..58147d1e5 100644 --- a/linux/drivers/media/video/v4l2-common.c +++ b/linux/drivers/media/video/v4l2-common.c @@ -44,7 +44,6 @@ * Added Gerd Knorrs v4l1 enhancements (Justin Schoeman) */ -#include <linux/config.h> #include "compat.h" #include <linux/module.h> #include <linux/types.h> |