diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 16:46:59 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 16:46:59 +0100 |
| commit | 2011a067281565494494aee194ca5081e52d6c3f (patch) | |
| tree | e0b21ad43e6eeb0c67945026be71d1278c93c695 /drivers/media/video/cx23885/cx23885-417.c | |
| parent | 63fb70859f987f2b3b8028fa467fd63336315e9c (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into x86/doc
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-417.c')
| -rw-r--r-- | drivers/media/video/cx23885/cx23885-417.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c index 395c11fa47c..00831f3ef8f 100644 --- a/drivers/media/video/cx23885/cx23885-417.c +++ b/drivers/media/video/cx23885/cx23885-417.c @@ -1815,7 +1815,7 @@ int cx23885_417_register(struct cx23885_dev *dev) cx23885_mc417_init(dev); printk(KERN_INFO "%s: registered device video%d [mpeg]\n", - dev->name, dev->v4l_device->minor & 0x1f); + dev->name, dev->v4l_device->num); return 0; } |