Merge ../linux-2.6/

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

diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index bef8a29..5785c34 100644 (file)
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -154,6 +154,7 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
                case CX88_BOARD_KWORLD_MCE200_DELUXE:
                case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT:
                case CX88_BOARD_PIXELVIEW_PLAYTV_P7000:
+               case CX88_BOARD_ASUS_PVR_416:
                        cx_clear(AUD_CTL, EN_I2SIN_ENABLE);
                        break;
                default:
@@ -725,7 +726,7 @@ static void set_audio_standard_FM(struct cx88_core *core,
 
 /* ----------------------------------------------------------- */
 
-int cx88_detect_nicam(struct cx88_core *core)
+static int cx88_detect_nicam(struct cx88_core *core)
 {
        int i, j = 0;