mirror of
https://github.com/torvalds/linux.git
synced 2024-12-13 22:53:20 +00:00
V4L/DVB (4086): There were a cross-reference on cpia and cpia_pp/cpia_usb
Those cross-references were generating an error: *** Warning: "cpia_pp_init" [/home/v4l/master/v4l/cpia.ko] undefined! *** Warning: "cpia_usb/_init" [/home/v4l/master/v4l/cpia.ko] undefined! Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
60110ce2b2
commit
2ed64eb9e7
@ -47,13 +47,6 @@
|
||||
|
||||
#include "cpia.h"
|
||||
|
||||
#ifdef CONFIG_VIDEO_CPIA_PP
|
||||
extern int cpia_pp_init(void);
|
||||
#endif
|
||||
#ifdef CONFIG_VIDEO_CPIA_USB
|
||||
extern int cpia_usb_init(void);
|
||||
#endif
|
||||
|
||||
static int video_nr = -1;
|
||||
|
||||
#ifdef MODULE
|
||||
@ -4047,13 +4040,6 @@ static int __init cpia_init(void)
|
||||
proc_cpia_create();
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_VIDEO_CPIA_PP
|
||||
cpia_pp_init();
|
||||
#endif
|
||||
#ifdef CONFIG_VIDEO_CPIA_USB
|
||||
cpia_usb_init();
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -803,7 +803,7 @@ static struct parport_driver cpia_pp_driver = {
|
||||
.detach = cpia_pp_detach,
|
||||
};
|
||||
|
||||
int cpia_pp_init(void)
|
||||
static int cpia_pp_init(void)
|
||||
{
|
||||
printk(KERN_INFO "%s v%d.%d.%d\n",ABOUT,
|
||||
CPIA_PP_MAJ_VER,CPIA_PP_MIN_VER,CPIA_PP_PATCH_VER);
|
||||
@ -860,6 +860,8 @@ void cleanup_module(void)
|
||||
|
||||
static int __init cpia_pp_setup(char *str)
|
||||
{
|
||||
int err;
|
||||
|
||||
if (!strncmp(str, "parport", 7)) {
|
||||
int n = simple_strtoul(str + 7, NULL, 10);
|
||||
if (parport_ptr < PARPORT_MAX) {
|
||||
@ -873,6 +875,10 @@ static int __init cpia_pp_setup(char *str)
|
||||
parport_nr[parport_ptr++] = PPCPIA_PARPORT_NONE;
|
||||
}
|
||||
|
||||
err=cpia_pp_init();
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -474,12 +474,6 @@ static int cpia_usb_close(void *privdata)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int cpia_usb_init(void)
|
||||
{
|
||||
/* return -ENODEV; */
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Probing and initializing */
|
||||
|
||||
static int cpia_probe(struct usb_interface *intf,
|
||||
|
Loading…
Reference in New Issue
Block a user