From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 13 Sep 2012 20:37:40 +0000 (-0300)
Subject: [media] shark,shark2: declare resume/suspend functions as static
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1f71927ed51e9125eb7a3d4aed54f68dd41f2c34;p=openwrt%2Fstaging%2Fblogic.git

[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>
---

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);