From c834e1f04af7a73dc75ec3a174b08508298b4520 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 22 Apr 2008 14:42:13 -0300 Subject: [PATCH] --- yaml --- r: 92394 b: refs/heads/master c: 4d34dccd5e8af3db8dbb594d6cd1ea74446dbf20 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/stk-webcam.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b2049441afcc..35013cf698d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0705135e59f8503e4dade4b3580fed77b1743b7c +refs/heads/master: 4d34dccd5e8af3db8dbb594d6cd1ea74446dbf20 diff --git a/trunk/drivers/media/video/stk-webcam.c b/trunk/drivers/media/video/stk-webcam.c index ceba45ad0294..d2bf54194b63 100644 --- a/trunk/drivers/media/video/stk-webcam.c +++ b/trunk/drivers/media/video/stk-webcam.c @@ -1465,7 +1465,7 @@ static void stk_camera_disconnect(struct usb_interface *interface) } #ifdef CONFIG_PM -int stk_camera_suspend(struct usb_interface *intf, pm_message_t message) +static int stk_camera_suspend(struct usb_interface *intf, pm_message_t message) { struct stk_camera *dev = usb_get_intfdata(intf); if (is_streaming(dev)) { @@ -1476,7 +1476,7 @@ int stk_camera_suspend(struct usb_interface *intf, pm_message_t message) return 0; } -int stk_camera_resume(struct usb_interface *intf) +static int stk_camera_resume(struct usb_interface *intf) { struct stk_camera *dev = usb_get_intfdata(intf); if (!is_initialised(dev))