Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / media / video / Kconfig

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 59522e9ccf3c78df0280f832ca33e9144fae4048..2703c66ebfbb1641bd0c761e9c94bff870d625eb 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -638,7 +638,7 @@ config VIDEO_ZORAN_ZR36060
        depends on VIDEO_ZORAN
        help
          Say Y to support Zoran boards based on 36060 chips.
-         This includes Iomega Bus, Pinnacle DC10, Linux media Labs 33
+         This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33
          and 33 R10 and AverMedia 6 boards.
 
 config VIDEO_ZORAN_BUZ