openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Mauro Carvalho Chehab 2012-09-13 17:37:40 -03:00
parent 559c200900
commit 1f71927ed5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/radio/radio-shark.c
View File

@ -375,12 +375,12 @@ static int usb_shark_probe(struct usb_interface *intf,
} }
#ifdef CONFIG_PM #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; 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 v4l2_device *v4l2_dev = usb_get_intfdata(intf);
struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev); struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev);

4
drivers/media/radio/radio-shark2.c
View File

@ -340,12 +340,12 @@ static int usb_shark_probe(struct usb_interface *intf,
} }
#ifdef CONFIG_PM #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; 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 v4l2_device *v4l2_dev = usb_get_intfdata(intf);
struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev); struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev);