diff --git a/[refs] b/[refs] index 4fc6521e51a7..d281661c23f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44f7f2b363a33e20ba9812e4a5c16fa7cc07a3ee +refs/heads/master: 81e47e33add6874dc0ee094bd2a672241cbba829 diff --git a/trunk/drivers/media/video/pwc/pwc-v4l.c b/trunk/drivers/media/video/pwc/pwc-v4l.c index ebf0a92b3956..9432cbc0e6f5 100644 --- a/trunk/drivers/media/video/pwc/pwc-v4l.c +++ b/trunk/drivers/media/video/pwc/pwc-v4l.c @@ -210,10 +210,6 @@ static struct v4l2_queryctrl pwc_controls[] = { }, }; -#if CONFIG_PWC_DEBUG -/* In 2.6.16-rc1 v4l_printk_ioctl is not defined but exported */ -extern void v4l_printk_ioctl(unsigned int cmd); -#endif static void pwc_vidioc_fill_fmt(const struct pwc_device *pdev, struct v4l2_format *f) {