diff --git a/[refs] b/[refs] index 14c132673936..77bae9cc4c59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b01466e14ce82ff96b74db19ebdaefb34a430a24 +refs/heads/master: 35774f42dc6e765fc1d8a92f36e218f617a17e1a diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig index d4a6e56a7135..ecbfa1b39b70 100644 --- a/trunk/drivers/media/video/Kconfig +++ b/trunk/drivers/media/video/Kconfig @@ -630,7 +630,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