diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-10-27 18:45:17 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-10-27 18:45:17 -0400 |
| commit | e343eb0d60f74547e0aeb5bd151105c2e6cfe588 (patch) | |
| tree | 92586df0daf3298262a957640e5c86679c963f41 /drivers/media/video | |
| parent | ddc04fd4d5163aee9ebdb38a56c365b602e2b7b7 (diff) | |
| parent | 012abeea669ea49636cf952d13298bb68654146a (diff) | |
| download | talos-op-linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.tar.gz talos-op-linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.zip | |
Merge commit 'v2.6.32-rc5' into for-2.6.33
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/cpia.c | 1 | ||||
| -rw-r--r-- | drivers/media/video/meye.c | 1 | ||||
| -rw-r--r-- | drivers/media/video/videobuf-core.c | 1 | ||||
| -rw-r--r-- | drivers/media/video/videobuf-dma-sg.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c index 43ab0adf3b61..2377313c041a 100644 --- a/drivers/media/video/cpia.c +++ b/drivers/media/video/cpia.c @@ -31,6 +31,7 @@ #include <linux/init.h> #include <linux/fs.h> #include <linux/vmalloc.h> +#include <linux/sched.h> #include <linux/slab.h> #include <linux/proc_fs.h> #include <linux/ctype.h> diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index 4b1bc05a462c..01e1eefcf1eb 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c @@ -28,6 +28,7 @@ */ #include <linux/module.h> #include <linux/pci.h> +#include <linux/sched.h> #include <linux/init.h> #include <linux/videodev.h> #include <media/v4l2-common.h> diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c index f1ccf98c0a6f..8e93c6f25c83 100644 --- a/drivers/media/video/videobuf-core.c +++ b/drivers/media/video/videobuf-core.c @@ -17,6 +17,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/mm.h> +#include <linux/sched.h> #include <linux/slab.h> #include <linux/interrupt.h> diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c index 53cdd67cebe1..032ebae0134a 100644 --- a/drivers/media/video/videobuf-dma-sg.c +++ b/drivers/media/video/videobuf-dma-sg.c @@ -21,6 +21,7 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/moduleparam.h> +#include <linux/sched.h> #include <linux/slab.h> #include <linux/interrupt.h> |
