diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
| commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
| tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /drivers/media/video/saa5246a.c | |
| parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
| parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'drivers/media/video/saa5246a.c')
| -rw-r--r-- | drivers/media/video/saa5246a.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c index 03e772130b55..6ee63e69b36c 100644 --- a/drivers/media/video/saa5246a.c +++ b/drivers/media/video/saa5246a.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include <linux/videotext.h> | 46 | #include <linux/videotext.h> |
| 47 | #include <linux/videodev.h> | 47 | #include <linux/videodev.h> |
| 48 | #include <media/v4l2-common.h> | 48 | #include <media/v4l2-common.h> |
| 49 | #include <media/v4l2-ioctl.h> | ||
| 49 | #include <linux/mutex.h> | 50 | #include <linux/mutex.h> |
| 50 | 51 | ||
| 51 | #include "saa5246a.h" | 52 | #include "saa5246a.h" |
| @@ -829,9 +830,7 @@ static const struct file_operations saa_fops = { | |||
| 829 | 830 | ||
| 830 | static struct video_device saa_template = | 831 | static struct video_device saa_template = |
| 831 | { | 832 | { |
| 832 | .owner = THIS_MODULE, | ||
| 833 | .name = IF_NAME, | 833 | .name = IF_NAME, |
| 834 | .type = VID_TYPE_TELETEXT, | ||
| 835 | .fops = &saa_fops, | 834 | .fops = &saa_fops, |
| 836 | .release = video_device_release, | 835 | .release = video_device_release, |
| 837 | .minor = -1, | 836 | .minor = -1, |