diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
| commit | ff9c38bba37937adb909cceb2a6521f2e92e17c6 (patch) | |
| tree | 93bd6152d9fa28348be99ef1c788040cc7b7a94d /drivers/media/video/mx1_camera.c | |
| parent | 65c0cfafce9575319fb6f70080fbe226e5617e3b (diff) | |
| parent | b2722b1c3a893ec6021508da15b32282ec79f4da (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/ht.c
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 @@ | |||
| 28 | #include <linux/moduleparam.h> | 28 | #include <linux/moduleparam.h> |
| 29 | #include <linux/mutex.h> | 29 | #include <linux/mutex.h> |
| 30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
| 31 | #include <linux/sched.h> | ||
| 31 | #include <linux/time.h> | 32 | #include <linux/time.h> |
| 32 | #include <linux/version.h> | 33 | #include <linux/version.h> |
| 33 | #include <linux/videodev2.h> | 34 | #include <linux/videodev2.h> |