diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-15 12:07:19 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-15 12:07:19 -0200 |
| commit | dc742d4b0ab1ce74bd3bb1c996b132254a8dc052 (patch) | |
| tree | 18213732ca1e2826296ae125dc99d39b3effcbac /linux/include/media/v4l2-int-device.h | |
| parent | 89a37f5497d1676d989c8c92da8866d5aaff5ee7 (diff) | |
| parent | 9458ed4c0ddff2ee425d54526badcbf3d8753926 (diff) | |
| download | mediapointer-dvb-s2-dc742d4b0ab1ce74bd3bb1c996b132254a8dc052.tar.gz mediapointer-dvb-s2-dc742d4b0ab1ce74bd3bb1c996b132254a8dc052.tar.bz2 | |
merge: http://ifup.org/hg/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media/v4l2-int-device.h')
| -rw-r--r-- | linux/include/media/v4l2-int-device.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux/include/media/v4l2-int-device.h b/linux/include/media/v4l2-int-device.h index 066ebfc4f..c8b80e0f0 100644 --- a/linux/include/media/v4l2-int-device.h +++ b/linux/include/media/v4l2-int-device.h @@ -44,9 +44,8 @@ enum v4l2_int_type { struct v4l2_int_device; struct v4l2_int_master { - int (*attach)(struct v4l2_int_device *master, - struct v4l2_int_device *slave); - void (*detach)(struct v4l2_int_device *master); + int (*attach)(struct v4l2_int_device *slave); + void (*detach)(struct v4l2_int_device *slave); }; typedef int (v4l2_int_ioctl_func)(struct v4l2_int_device *); |