Merge branch 'linus' into x86/cleanups

[linux-2.6-omap-h63xx.git] / drivers / media / video / cx88 / cx88-core.c

diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 60705b08bfe899e5c39a17ef6dd83b8436f9ff30..b045874ad04f98c5d89048204e57277ce345e4a7 100644 (file)
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -844,6 +844,9 @@ static int set_tvaudio(struct cx88_core *core)
        } else if (V4L2_STD_SECAM_L & norm) {
                core->tvaudio = WW_L;
 
+       } else if ((V4L2_STD_SECAM_B | V4L2_STD_SECAM_G | V4L2_STD_SECAM_H) & norm) {
+               core->tvaudio = WW_BG;
+
        } else if (V4L2_STD_SECAM_DK & norm) {
                core->tvaudio = WW_DK;