diff options
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/media/ir-common.h | 1 | ||||
| -rw-r--r-- | linux/include/media/v4l2-int-device.h | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/linux/include/media/ir-common.h b/linux/include/media/ir-common.h index 7a785fa77..b904d3257 100644 --- a/linux/include/media/ir-common.h +++ b/linux/include/media/ir-common.h @@ -97,7 +97,6 @@ int ir_dump_samples(u32 *samples, int count); int ir_decode_biphase(u32 *samples, int count, int low, int high); int ir_decode_pulsedistance(u32 *samples, int count, int low, int high); -u32 ir_rc5_decode(unsigned int code); void ir_rc5_timer_end(unsigned long data); void ir_rc5_timer_keyup(unsigned long data); 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 *); |