Merge branch '83xx' into for_paulus

[linux-2.6] / drivers / media / video / cpia.c

diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index 2227c5640c12c9552ade8b05d92cc9d8a7ad3234..3b31a0dd2f0cde9645f8740753922161130654df 100644 (file)
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -26,7 +26,6 @@
 /* define _CPIA_DEBUG_ for verbose debug output (see cpia.h) */
 /* #define _CPIA_DEBUG_  1 */
 
-#include <linux/config.h>
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -47,13 +46,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
@@ -64,14 +56,13 @@ MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("video");
 #endif
 
-static unsigned short colorspace_conv = 0;
+static unsigned short colorspace_conv;
 module_param(colorspace_conv, ushort, 0444);
 MODULE_PARM_DESC(colorspace_conv,
-                "\n<n> Colorspace conversion:"
-                "\n0 = disable"
-                "\n1 = enable"
-                "\nDefault value is 0"
-                "\n");
+                " Colorspace conversion:"
+                "\n  0 = disable, 1 = enable"
+                "\n  Default value is 0"
+                );
 
 #define ABOUT "V4L-Driver for Vision CPiA based cameras"
 
@@ -4042,19 +4033,12 @@ static int __init cpia_init(void)
               "allowed, it is disabled by default now. Users should fix the "
               "applications in case they don't work without conversion "
               "reenabled by setting the 'colorspace_conv' module "
-              "parameter to 1");
+              "parameter to 1\n");
 
 #ifdef CONFIG_PROC_FS
        proc_cpia_create();
 #endif
 
-#ifdef CONFIG_VIDEO_CPIA_PP
-       cpia_pp_init();
-#endif
-#ifdef CONFIG_VIDEO_CPIA_USB
-       cpia_usb_init();
-#endif
-
        return 0;
 }