summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/zr36060.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-02-05 10:31:13 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-02-05 10:31:13 -0200
commit678c39afdb2904d63f5e55ce708e635c944892ce (patch)
tree07183685b46c23dc23a9334eacce4ebb5d071605 /linux/drivers/media/video/zr36060.c
parentc239611668a3d8add80d686d266956a8fcac5ca4 (diff)
parentdebafa4c14110eb6c01ab9756953c5f9cd351f05 (diff)
downloadmediapointer-dvb-s2-678c39afdb2904d63f5e55ce708e635c944892ce.tar.gz
mediapointer-dvb-s2-678c39afdb2904d63f5e55ce708e635c944892ce.tar.bz2
merge: http://ifup.org/hg/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/zr36060.c')
-rw-r--r--linux/drivers/media/video/zr36060.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/zr36060.c b/linux/drivers/media/video/zr36060.c
index 940055191..8e74054d5 100644
--- a/linux/drivers/media/video/zr36060.c
+++ b/linux/drivers/media/video/zr36060.c
@@ -163,7 +163,7 @@ zr36060_wait_end (struct zr36060 *ptr)
udelay(1);
if (i++ > 200000) { // 200ms, there is for sure something wrong!!!
dprintk(1,
- "%s: timout at wait_end (last status: 0x%02x)\n",
+ "%s: timeout at wait_end (last status: 0x%02x)\n",
ptr->name, ptr->status);
break;
}