Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev

[linux-2.6] / drivers / media / video / vino.c

diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index d545c98dd5e7e3eb1a85c12ff64adfa977ba9345..01ea99c9bc1aa5db2d208bff7e23aa54463ab7c6 100644 (file)
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -13,7 +13,7 @@
 /*
  * TODO:
  * - remove "mark pages reserved-hacks" from memory allocation code
- *   and implement nopage()
+ *   and implement fault()
  * - check decimation, calculating and reporting image size when
  *   using decimation
  * - implement read(), user mode buffers and overlay (?)