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

[pandora-kernel.git] / drivers / media / video / cx88 / cx88-dsp.c

diff --git a/drivers/media/video/cx88/cx88-dsp.c b/drivers/media/video/cx88/cx88-dsp.c
index e1d6eef..a990726 100644 (file)
--- a/drivers/media/video/cx88/cx88-dsp.c
+++ b/drivers/media/video/cx88/cx88-dsp.c
@@ -175,13 +175,7 @@ static s32 detect_a2_a2m_eiaj(struct cx88_core *core, s16 x[], u32 N)
                stereo_freq = FREQ_EIAJ_STEREO;
                dual_freq = FREQ_EIAJ_DUAL;
                break;
-       case WW_NONE:
-       case WW_BTSC:
-       case WW_I:
-       case WW_L:
-       case WW_I2SPT:
-       case WW_FM:
-       case WW_I2SADC:
+       default:
                printk(KERN_WARNING "%s/0: unsupported audio mode %d for %s\n",
                       core->name, core->tvaudio, __func__);
                return UNSET;
@@ -236,7 +230,7 @@ static s32 detect_btsc(struct cx88_core *core, s16 x[], u32 N)
 
 static s16 *read_rds_samples(struct cx88_core *core, u32 *N)
 {
-       struct sram_channel *srch = &cx88_sram_channels[SRAM_CH27];
+       const struct sram_channel *srch = &cx88_sram_channels[SRAM_CH27];
        s16 *samples;
 
        unsigned int i;