From f49c61bafefad133aadefb2c725379d861ff086c Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 20 Nov 2007 09:00:35 -0300 Subject: [PATCH] --- yaml --- r: 76427 b: refs/heads/master c: ac9bb7f5167d53207893a783a2f722cd6e6ed78f h: refs/heads/master i: 76425: 243ed7ceb400da2e92a3f9ae1f75b13e47a74806 76423: f43b6322b177170324cff4e2f71d0badf35c50e5 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx25840/cx25840-vbi.c | 2 +- trunk/drivers/media/video/meye.c | 2 +- trunk/drivers/media/video/saa7134/saa7134-input.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 97b075b157fa..13b51306e1b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13d97010ed0850fd7803563a2b9d92a56bb4aa35 +refs/heads/master: ac9bb7f5167d53207893a783a2f722cd6e6ed78f diff --git a/trunk/drivers/media/video/cx25840/cx25840-vbi.c b/trunk/drivers/media/video/cx25840/cx25840-vbi.c index ced13febed89..6828f59b9d83 100644 --- a/trunk/drivers/media/video/cx25840/cx25840-vbi.c +++ b/trunk/drivers/media/video/cx25840/cx25840-vbi.c @@ -180,7 +180,7 @@ void cx25840_vbi_setup(struct i2c_client *client) fsc/1000000,fsc%1000000); v4l_dbg(1, cx25840_debug, client, "hblank %i, hactive %i, " - "vblank %i , vactive %i, vblank656 %i, src_dec %i," + "vblank %i, vactive %i, vblank656 %i, src_dec %i, " "burst 0x%02x, luma_lpf %i, uv_lpf %i, comb 0x%02x," " sc 0x%06x\n", hblank, hactive, vblank, vactive, vblank656, diff --git a/trunk/drivers/media/video/meye.c b/trunk/drivers/media/video/meye.c index c31163290432..3d51fa0a52b6 100644 --- a/trunk/drivers/media/video/meye.c +++ b/trunk/drivers/media/video/meye.c @@ -2023,7 +2023,7 @@ static int __init meye_init(void) if (gbufsize < 0 || gbufsize > MEYE_MAX_BUFSIZE) gbufsize = MEYE_MAX_BUFSIZE; gbufsize = PAGE_ALIGN(gbufsize); - printk(KERN_INFO "meye: using %d buffers with %dk (%dk total)" + printk(KERN_INFO "meye: using %d buffers with %dk (%dk total) " "for capture\n", gbuffers, gbufsize / 1024, gbuffers * gbufsize / 1024); diff --git a/trunk/drivers/media/video/saa7134/saa7134-input.c b/trunk/drivers/media/video/saa7134/saa7134-input.c index 3abaa1b8ac9d..a485185357c8 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-input.c +++ b/trunk/drivers/media/video/saa7134/saa7134-input.c @@ -49,7 +49,7 @@ module_param(repeat_delay, int, 0644); MODULE_PARM_DESC(repeat_delay, "delay before key repeat started"); static int repeat_period = 33; module_param(repeat_period, int, 0644); -MODULE_PARM_DESC(repeat_period, "repeat period between" +MODULE_PARM_DESC(repeat_period, "repeat period between " "keypresses when key is down"); #define dprintk(fmt, arg...) if (ir_debug) \