aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zr36120_i2c.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-03-09 14:32:05 +1100
committerPaul Mackerras <paulus@samba.org>2006-03-09 14:32:05 +1100
commit516450179454de9e689e0a53ed8f34b896e8651c (patch)
tree78eae2f77de6cd39b18c7393fc5854456fc3fb1f /drivers/media/video/zr36120_i2c.c
parent6749c5507388f3fc3719f57a54b540ee83f6661a (diff)
parent0d514f040ac6629311974889d5b96bcf21c6461a (diff)
downloadkernel_goldelico_gta04-516450179454de9e689e0a53ed8f34b896e8651c.zip
kernel_goldelico_gta04-516450179454de9e689e0a53ed8f34b896e8651c.tar.gz
kernel_goldelico_gta04-516450179454de9e689e0a53ed8f34b896e8651c.tar.bz2
Merge ../linux-2.6
Diffstat (limited to 'drivers/media/video/zr36120_i2c.c')
-rw-r--r--drivers/media/video/zr36120_i2c.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/zr36120_i2c.c b/drivers/media/video/zr36120_i2c.c
index 6bfe84d..21fde43 100644
--- a/drivers/media/video/zr36120_i2c.c
+++ b/drivers/media/video/zr36120_i2c.c
@@ -65,7 +65,7 @@ void attach_inform(struct i2c_bus *bus, int id)
case I2C_DRIVERID_VIDEODECODER:
DEBUG(printk(CARD_INFO "decoder attached\n",CARD));
- /* fetch the capabilites of the decoder */
+ /* fetch the capabilities of the decoder */
rv = i2c_control_device(&ztv->i2c, I2C_DRIVERID_VIDEODECODER, DECODER_GET_CAPABILITIES, &dc);
if (rv) {
DEBUG(printk(CARD_DEBUG "decoder is not V4L aware!\n",CARD));