diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
| commit | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch) | |
| tree | da3aa535c98cc0957851354ceb0fbff7482d7a9d /drivers/media/video/et61x251 | |
| parent | 1a1689344add3333d28d1b5495d8043a3877d01c (diff) | |
| parent | 4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff) | |
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
Diffstat (limited to 'drivers/media/video/et61x251')
| -rw-r--r-- | drivers/media/video/et61x251/et61x251_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c index 86e353b26b53..49792ae8c61c 100644 --- a/drivers/media/video/et61x251/et61x251_core.c +++ b/drivers/media/video/et61x251/et61x251_core.c | |||
| @@ -2454,7 +2454,7 @@ static int et61x251_ioctl(struct inode* inode, struct file* filp, | |||
| 2454 | } | 2454 | } |
| 2455 | 2455 | ||
| 2456 | 2456 | ||
| 2457 | static struct file_operations et61x251_fops = { | 2457 | static const struct file_operations et61x251_fops = { |
| 2458 | .owner = THIS_MODULE, | 2458 | .owner = THIS_MODULE, |
| 2459 | .open = et61x251_open, | 2459 | .open = et61x251_open, |
| 2460 | .release = et61x251_release, | 2460 | .release = et61x251_release, |