diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
| commit | 4b7bd364700d9ac8372eff48832062b936d0793b (patch) | |
| tree | 0dbf78c95456a0b02d07fcd473281f04a87e266d /drivers/media/video/sn9c102 | |
| parent | c0d8768af260e2cbb4bf659ae6094a262c86b085 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge branch 'master' into for-next
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.c
Needed to update to apply fixes for which the old branch was too
outdated.
Diffstat (limited to 'drivers/media/video/sn9c102')
| -rw-r--r-- | drivers/media/video/sn9c102/sn9c102_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c index 28e19daadec9..f49fbfb7dc13 100644 --- a/drivers/media/video/sn9c102/sn9c102_core.c +++ b/drivers/media/video/sn9c102/sn9c102_core.c | |||
| @@ -3238,7 +3238,7 @@ static const struct v4l2_file_operations sn9c102_fops = { | |||
| 3238 | .owner = THIS_MODULE, | 3238 | .owner = THIS_MODULE, |
| 3239 | .open = sn9c102_open, | 3239 | .open = sn9c102_open, |
| 3240 | .release = sn9c102_release, | 3240 | .release = sn9c102_release, |
| 3241 | .ioctl = sn9c102_ioctl, | 3241 | .unlocked_ioctl = sn9c102_ioctl, |
| 3242 | .read = sn9c102_read, | 3242 | .read = sn9c102_read, |
| 3243 | .poll = sn9c102_poll, | 3243 | .poll = sn9c102_poll, |
| 3244 | .mmap = sn9c102_mmap, | 3244 | .mmap = sn9c102_mmap, |