From 272340fe5cfc9e96f6aa72e02df8ffa9778158d8 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Thu, 3 Feb 2011 13:42:50 +0200 Subject: [PATCH] --- yaml --- r: 235815 b: refs/heads/master c: 30a2cb350fcc34f36f86ecf4a5505f02e6810727 h: refs/heads/master i: 235813: 07c9cf87c7138dede013e781a5ef312f62e9b245 235811: dd517b78bc0828db2798102ead7f846b4f9b3192 235807: 843064910f6724d5e3fd0e9149142ff08f00ba5b v: v3 --- [refs] | 2 +- trunk/drivers/staging/easycap/easycap.h | 1 - trunk/drivers/staging/easycap/easycap_sound_oss.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9b4022e484e1..7847c73a45dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7863ff276d2a151aaf1b4ad7798ff2610e7b2996 +refs/heads/master: 30a2cb350fcc34f36f86ecf4a5505f02e6810727 diff --git a/trunk/drivers/staging/easycap/easycap.h b/trunk/drivers/staging/easycap/easycap.h index dfda1008532f..da77e3ee6230 100644 --- a/trunk/drivers/staging/easycap/easycap.h +++ b/trunk/drivers/staging/easycap/easycap.h @@ -692,7 +692,6 @@ extern struct usb_driver easycap_usb_driver; extern struct easycap_dongle easycapdc60_dongle[]; #ifdef CONFIG_EASYCAP_OSS extern struct usb_class_driver easyoss_class; -extern const struct file_operations easyoss_fops; #endif /* !CONFIG_EASYCAP_OSS */ #endif /* !__EASYCAP_H__ */ diff --git a/trunk/drivers/staging/easycap/easycap_sound_oss.c b/trunk/drivers/staging/easycap/easycap_sound_oss.c index 7acdd8ff72e4..ab1b3ccf4147 100644 --- a/trunk/drivers/staging/easycap/easycap_sound_oss.c +++ b/trunk/drivers/staging/easycap/easycap_sound_oss.c @@ -1002,7 +1002,7 @@ return 0; } /*****************************************************************************/ -const struct file_operations easyoss_fops = { +static const struct file_operations easyoss_fops = { .owner = THIS_MODULE, .open = easyoss_open, .release = easyoss_release,