diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-08 16:16:46 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 01:05:06 -0400 |
commit | 2ed64eb9e7b4cf27055f78a7bd2ccf33a912d0cd (patch) | |
tree | be2e88bf167c3015a1da9edac94ba863e8f5da6e /drivers/media/video/cpia_pp.c | |
parent | 60110ce2b2ce74d8a49a4600ce58ba0b44f82800 (diff) |
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>
Diffstat (limited to 'drivers/media/video/cpia_pp.c')
-rw-r--r-- | drivers/media/video/cpia_pp.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/video/cpia_pp.c b/drivers/media/video/cpia_pp.c index 0b00e6027dfb..4c89bd395d3e 100644 --- a/drivers/media/video/cpia_pp.c +++ b/drivers/media/video/cpia_pp.c | |||
@@ -803,7 +803,7 @@ static struct parport_driver cpia_pp_driver = { | |||
803 | .detach = cpia_pp_detach, | 803 | .detach = cpia_pp_detach, |
804 | }; | 804 | }; |
805 | 805 | ||
806 | int cpia_pp_init(void) | 806 | static int cpia_pp_init(void) |
807 | { | 807 | { |
808 | printk(KERN_INFO "%s v%d.%d.%d\n",ABOUT, | 808 | printk(KERN_INFO "%s v%d.%d.%d\n",ABOUT, |
809 | CPIA_PP_MAJ_VER,CPIA_PP_MIN_VER,CPIA_PP_PATCH_VER); | 809 | CPIA_PP_MAJ_VER,CPIA_PP_MIN_VER,CPIA_PP_PATCH_VER); |
@@ -860,6 +860,8 @@ void cleanup_module(void) | |||
860 | 860 | ||
861 | static int __init cpia_pp_setup(char *str) | 861 | static int __init cpia_pp_setup(char *str) |
862 | { | 862 | { |
863 | int err; | ||
864 | |||
863 | if (!strncmp(str, "parport", 7)) { | 865 | if (!strncmp(str, "parport", 7)) { |
864 | int n = simple_strtoul(str + 7, NULL, 10); | 866 | int n = simple_strtoul(str + 7, NULL, 10); |
865 | if (parport_ptr < PARPORT_MAX) { | 867 | if (parport_ptr < PARPORT_MAX) { |
@@ -873,6 +875,10 @@ static int __init cpia_pp_setup(char *str) | |||
873 | parport_nr[parport_ptr++] = PPCPIA_PARPORT_NONE; | 875 | parport_nr[parport_ptr++] = PPCPIA_PARPORT_NONE; |
874 | } | 876 | } |
875 | 877 | ||
878 | err=cpia_pp_init(); | ||
879 | if (err) | ||
880 | return err; | ||
881 | |||
876 | return 1; | 882 | return 1; |
877 | } | 883 | } |
878 | 884 | ||