diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 03:08:27 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-26 03:08:27 -0400 |
| commit | e19553427c2e8fdb04fdd98e407164bb59a840ba (patch) | |
| tree | 5332234b2dad07c03c27e4608afb16f297f41e61 /drivers/media/video/saa5246a.c | |
| parent | 35f6cd4a06432034665a1499ca4b022437423aac (diff) | |
| parent | 83515bc7df812555e20cda48614674e2f346f9f5 (diff) | |
Merge branch 'sh/stable-updates'
Conflicts:
arch/sh/kernel/dwarf.c
drivers/dma/shdma.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/media/video/saa5246a.c')
| -rw-r--r-- | drivers/media/video/saa5246a.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c index 5ab6a0f901c0..6b3b09ef8978 100644 --- a/drivers/media/video/saa5246a.c +++ b/drivers/media/video/saa5246a.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | #include <linux/mm.h> | 43 | #include <linux/mm.h> |
| 44 | #include <linux/init.h> | 44 | #include <linux/init.h> |
| 45 | #include <linux/i2c.h> | 45 | #include <linux/i2c.h> |
| 46 | #include <linux/slab.h> | ||
| 46 | #include <linux/mutex.h> | 47 | #include <linux/mutex.h> |
| 47 | #include <linux/videotext.h> | 48 | #include <linux/videotext.h> |
| 48 | #include <linux/videodev2.h> | 49 | #include <linux/videodev2.h> |