X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fvideo%2Fcpia_pp.c;h=0b00e6027dfb302669a688f0167bc7a0bf8e1377;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=41f4b8d17559d085eab1f3c6a3bf0f278eb71264;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/media/video/cpia_pp.c b/drivers/media/video/cpia_pp.c
index 41f4b8d17..0b00e6027 100644
--- a/drivers/media/video/cpia_pp.c
+++ b/drivers/media/video/cpia_pp.c
@@ -25,6 +25,7 @@
 /* define _CPIA_DEBUG_ for verbose debug output (see cpia.h) */
 /* #define _CPIA_DEBUG_  1 */
 
+#include <linux/config.h>
 
 #include <linux/module.h>
 #include <linux/init.h>
@@ -802,7 +803,7 @@ static struct parport_driver cpia_pp_driver = {
 	.detach = cpia_pp_detach,
 };
 
-static int cpia_pp_init(void)
+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);
@@ -859,8 +860,6 @@ 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) {
@@ -874,10 +873,6 @@ 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;
 }