From 8b23b735fca33330268b5f4211bffaa04c2a1972 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Mon, 27 Mar 2006 16:18:25 -0300 Subject: [PATCH] --- yaml --- r: 25138 b: refs/heads/master c: 9419045f842e7b763928636f9c61dfa134b2052d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cpia.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 21148dfd6a32..ebf9a5a70668 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26abe0234d443f1089ea7e514c8fc66493c0d307 +refs/heads/master: 9419045f842e7b763928636f9c61dfa134b2052d diff --git a/trunk/drivers/media/video/cpia.c b/trunk/drivers/media/video/cpia.c index 2227c5640c12..85d84e89d8f4 100644 --- a/trunk/drivers/media/video/cpia.c +++ b/trunk/drivers/media/video/cpia.c @@ -64,14 +64,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 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,7 +4041,7 @@ 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();