Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 92394
b: refs/heads/master
c: 4d34dcc
h: refs/heads/master
v: v3
  • Loading branch information
Adrian Bunk authored and Mauro Carvalho Chehab committed Apr 24, 2008
1 parent 233a60c commit c834e1f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0705135e59f8503e4dade4b3580fed77b1743b7c
refs/heads/master: 4d34dccd5e8af3db8dbb594d6cd1ea74446dbf20
4 changes: 2 additions & 2 deletions trunk/drivers/media/video/stk-webcam.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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))
Expand Down

0 comments on commit c834e1f

Please sign in to comment.