summaryrefslogtreecommitdiff
path: root/drivers/media/radio
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2012-09-14 00:37:40 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-14 00:42:13 +0400
commit1f71927ed51e9125eb7a3d4aed54f68dd41f2c34 (patch)
tree42cb10908fa9fbc8a3291cf91e6bf86587ccfc2b /drivers/media/radio
parent559c2009003bb8092e4927a4bac99cbf75834979 (diff)
downloadlinux-1f71927ed51e9125eb7a3d4aed54f68dd41f2c34.tar.xz
[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')
-rw-r--r--drivers/media/radio/radio-shark.c4
-rw-r--r--drivers/media/radio/radio-shark2.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
index 248bc3a30832..8c309c7134d7 100644
--- a/drivers/media/radio/radio-shark.c
+++ b/drivers/media/radio/radio-shark.c
@@ -375,12 +375,12 @@ err_alloc_buffer:
}
#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);
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:
}
#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);