diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 16:59:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 16:59:34 -0800 |
| commit | 7a2fe8c49f0f346601a18c69ba0f75227c0c5993 (patch) | |
| tree | c42b1a4734fd23b5c71f43180c3f0bccaeb9023c /drivers/media/video/cpia.c | |
| parent | 2ec5e3a867d63d04932e11c6097f63760d9be3fe (diff) | |
| parent | 155ec9e63da962bf26ffc65a4088c6cc935f28db (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
Merge branch 'work-fixes'
V4L/DVB (3413): Typos grab bag of the month
V4L/DVB (3403): Workaround to fix initialization for Nexus CA
Merge branch 'work-fixes'
V4L/DVB (3395): Fixed Pinnacle 300i DVB-T support
V4L/DVB (3399): ELSA EX-VISION 500TV: fix incorrect PCI subsystem ID
V4L/DVB (3382): Fix stv0297 for qam128 on tt c1500 (saa7146)
V4L/DVB (3300a): Removing personal email from DVB maintainers
V4L/DVB (3385): Dvb: fix __init/__exit section references in av7110 driver
V4L/DVB (3378): Restore power on defaults of tda9887 after tda8290 probe
V4L/DVB (3354): Fix maximum for the saturation and contrast controls.
V4L/DVB (3352): Cxusb: fix lgdt3303 naming
V4L/DVB (3348): Fixed saa7134 ALSA initialization with multiple cards
V4L/DVB (3347): Pinnacle PCTV 40i: add filtered Composite2 input
V4L/DVB (3341): Upstream sync - make 2 structs static
V4L/DVB (3340): Make a struct static
V4L/DVB (3337): Drivers/media/dvb/frontends/mt312.c: cleanups
V4L/DVB (3336): Bt8xx documentation authors fix
Diffstat (limited to 'drivers/media/video/cpia.c')
| -rw-r--r-- | drivers/media/video/cpia.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c index 9f59541155d..85d964b5b33 100644 --- a/drivers/media/video/cpia.c +++ b/drivers/media/video/cpia.c @@ -3369,7 +3369,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file, //DBG("cpia_ioctl: %u\n", ioctlnr); switch (ioctlnr) { - /* query capabilites */ + /* query capabilities */ case VIDIOCGCAP: { struct video_capability *b = arg; |