aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/radio/radio-shark2.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2012-09-13 16:37:40 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-13 16:42:13 -0400
commit1f71927ed51e9125eb7a3d4aed54f68dd41f2c34 (patch)
tree42cb10908fa9fbc8a3291cf91e6bf86587ccfc2b /drivers/media/radio/radio-shark2.c
parent559c2009003bb8092e4927a4bac99cbf75834979 (diff)
[media] shark,shark2: declare resume/suspend functions as static
drivers/media/radio/shark2.o: In function `_GLOBAL__sub_I_65535_0_usb_shark_suspend': drivers/media/radio/radio-shark2.c:344: multiple definition of `usb_shark_suspend' drivers/media/radio/radio-shark.o:/home/v4l/v4l/patchwork/drivers/media/radio/radio-shark.c:379: first defined here drivers/media/radio/shark2.o: In function `usb_shark_resume': drivers/media/radio/radio-shark2.c:349: multiple definition of `usb_shark_resume' drivers/media/radio/radio-shark.o:/home/v4l/v4l/patchwork/drivers/media/radio/radio-shark.c:384: first defined here Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/radio/radio-shark2.c')
-rw-r--r--drivers/media/radio/radio-shark2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
index 9740c760b73c..ef65ebbd5364 100644
--- a/drivers/media/radio/radio-shark2.c
+++ b/drivers/media/radio/radio-shark2.c
@@ -340,12 +340,12 @@ err_alloc_buffer:
340} 340}
341 341
342#ifdef CONFIG_PM 342#ifdef CONFIG_PM
343int usb_shark_suspend(struct usb_interface *intf, pm_message_t message) 343static int usb_shark_suspend(struct usb_interface *intf, pm_message_t message)
344{ 344{
345 return 0; 345 return 0;
346} 346}
347 347
348int usb_shark_resume(struct usb_interface *intf) 348static int usb_shark_resume(struct usb_interface *intf)
349{ 349{
350 struct v4l2_device *v4l2_dev = usb_get_intfdata(intf); 350 struct v4l2_device *v4l2_dev = usb_get_intfdata(intf);
351 struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev); 351 struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev);