summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-core.c2
-rw-r--r--v4l/ChangeLog7
2 files changed, 8 insertions, 1 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-core.c b/linux/drivers/media/video/em28xx/em28xx-core.c
index c0b29d02a..b78449f2a 100644
--- a/linux/drivers/media/video/em28xx/em28xx-core.c
+++ b/linux/drivers/media/video/em28xx/em28xx-core.c
@@ -303,7 +303,7 @@ int em28xx_write_ac97(struct em28xx *dev, u8 reg, u8 * val)
if ((ret = em28xx_read_reg(dev, AC97BUSY_REG)) < 0)
return ret;
else if (((u8) ret) & 0x01) {
- em28xx_warn ("AC97 command still being exectuted: not handled properly!\n");
+ em28xx_warn ("AC97 command still being executed: not handled properly!\n");
}
return 0;
}
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index a0dcee8fe..b93e06095 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-22 19:21 mkrufky
+
+ * linux/drivers/media/video/em28xx/em28xx-core.c:
+ - fixed spelling error, exectuted --> executed.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2006-01-22 19:09 hverkuil
* linux/include/media/v4l2-common.h: