Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[pandora-kernel.git] / Documentation / video4linux / Zoran

diff --git a/Documentation/video4linux/Zoran b/Documentation/video4linux/Zoran
index c40e3ba..9ed629d 100644 (file)
--- a/Documentation/video4linux/Zoran
+++ b/Documentation/video4linux/Zoran
@@ -130,7 +130,6 @@ Card number: 4
 
 Note: No module for the mse3000 is available yet
 Note: No module for the vpx3224 is available yet
-Note: use encoder=X or decoder=X for non-default i2c chips
 
 ===========================