diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-12-23 01:21:47 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-12-23 01:21:47 +0100 |
| commit | f80ca163d65903276bec7045a484a79c0897eb2d (patch) | |
| tree | 97c7d61d43248b9db0757a76af80ff58b98b5599 /drivers/media/video/mx1_camera.c | |
| parent | drivers/dma: Correct use after free (diff) | |
| parent | ioat2,3: put channel hardware in known state at init (diff) | |
| download | linux-f80ca163d65903276bec7045a484a79c0897eb2d.tar.xz linux-f80ca163d65903276bec7045a484a79c0897eb2d.zip | |
Merge branch 'ioat' into fixes
Diffstat (limited to 'drivers/media/video/mx1_camera.c')
| -rw-r--r-- | drivers/media/video/mx1_camera.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c index 5f37952c75cf..72802291e812 100644 --- a/drivers/media/video/mx1_camera.c +++ b/drivers/media/video/mx1_camera.c @@ -28,6 +28,7 @@ #include <linux/moduleparam.h> #include <linux/mutex.h> #include <linux/platform_device.h> +#include <linux/sched.h> #include <linux/time.h> #include <linux/version.h> #include <linux/videodev2.h> |