Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330954
b: refs/heads/master
c: 1f71927
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Sep 13, 2012
1 parent dfdd62e commit 0e7cdc6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 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: 559c2009003bb8092e4927a4bac99cbf75834979
refs/heads/master: 1f71927ed51e9125eb7a3d4aed54f68dd41f2c34
4 changes: 2 additions & 2 deletions trunk/drivers/media/radio/radio-shark.c
Original file line number Diff line number Diff line change
Expand Up @@ -375,12 +375,12 @@ static int usb_shark_probe(struct usb_interface *intf,
}

#ifdef CONFIG_PM
int usb_shark_suspend(struct usb_interface *intf, pm_message_t message)
static int usb_shark_suspend(struct usb_interface *intf, pm_message_t message)
{
return 0;
}

int usb_shark_resume(struct usb_interface *intf)
static int usb_shark_resume(struct usb_interface *intf)
{
struct v4l2_device *v4l2_dev = usb_get_intfdata(intf);
struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev);
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/media/radio/radio-shark2.c
Original file line number Diff line number Diff line change
Expand Up @@ -340,12 +340,12 @@ static int usb_shark_probe(struct usb_interface *intf,
}

#ifdef CONFIG_PM
int usb_shark_suspend(struct usb_interface *intf, pm_message_t message)
static int usb_shark_suspend(struct usb_interface *intf, pm_message_t message)
{
return 0;
}

int usb_shark_resume(struct usb_interface *intf)
static int usb_shark_resume(struct usb_interface *intf)
{
struct v4l2_device *v4l2_dev = usb_get_intfdata(intf);
struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev);
Expand Down

0 comments on commit 0e7cdc6

Please sign in to comment.