Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 181566
b: refs/heads/master
c: f8bd9d2
h: refs/heads/master
v: v3
  • Loading branch information
Devin Heitmueller authored and Mauro Carvalho Chehab committed Feb 26, 2010
1 parent fb9d6aa commit e3cc48a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 780edb7ad60e5c657770f510747cc609c84b5b61
refs/heads/master: f8bd9d26c59d0df0335bf43191feb732f2c8b6ad
8 changes: 5 additions & 3 deletions trunk/drivers/media/video/cx18/cx18-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,8 @@ MODULE_PARM_DESC(enc_pcm_bufs,
"Number of encoder PCM buffers\n"
"\t\t\tDefault is computed from other enc_pcm_* parameters");

MODULE_PARM_DESC(cx18_first_minor, "Set device node number assigned to first card");
MODULE_PARM_DESC(cx18_first_minor,
"Set device node number assigned to first card");

MODULE_AUTHOR("Hans Verkuil");
MODULE_DESCRIPTION("CX23418 driver");
Expand Down Expand Up @@ -1252,7 +1253,7 @@ static void cx18_remove(struct pci_dev *pci_dev)
#if defined(CONFIG_MODULES) && defined(MODULE)
static void request_module_async(struct work_struct *work)
{
struct cx18 *dev=container_of(work, struct cx18, request_module_wk);
struct cx18 *dev = container_of(work, struct cx18, request_module_wk);

/* Make sure cx18-alsa module is loaded */
request_module("cx18-alsa");
Expand Down Expand Up @@ -1281,7 +1282,8 @@ static struct pci_driver cx18_pci_driver = {

static int __init module_start(void)
{
printk(KERN_INFO "cx18: Start initialization, version %s\n", CX18_VERSION);
printk(KERN_INFO "cx18: Start initialization, version %s\n",
CX18_VERSION);

/* Validate parameters */
if (cx18_first_minor < 0 || cx18_first_minor >= CX18_MAX_CARDS) {
Expand Down

0 comments on commit e3cc48a

Please sign in to comment.