aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/msp3400-driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/msp3400-driver.c')
-rw-r--r--drivers/media/video/msp3400-driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index 7a11f3159e3..b73c740f7fb 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -366,7 +366,7 @@ int msp_sleep(struct msp_state *state, int timeout)
366} 366}
367 367
368/* ------------------------------------------------------------------------ */ 368/* ------------------------------------------------------------------------ */
369#ifdef CONFIG_VIDEO_V4L1 369#ifdef CONFIG_VIDEO_ALLOW_V4L1
370static int msp_mode_v4l2_to_v4l1(int rxsubchans, int audmode) 370static int msp_mode_v4l2_to_v4l1(int rxsubchans, int audmode)
371{ 371{
372 if (rxsubchans == V4L2_TUNER_SUB_MONO) 372 if (rxsubchans == V4L2_TUNER_SUB_MONO)
@@ -514,7 +514,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
514 /* --- v4l ioctls --- */ 514 /* --- v4l ioctls --- */
515 /* take care: bttv does userspace copying, we'll get a 515 /* take care: bttv does userspace copying, we'll get a
516 kernel pointer here... */ 516 kernel pointer here... */
517#ifdef CONFIG_VIDEO_V4L1 517#ifdef CONFIG_VIDEO_ALLOW_V4L1
518 case VIDIOCGAUDIO: 518 case VIDIOCGAUDIO:
519 { 519 {
520 struct video_audio *va = arg; 520 struct video_audio *va = arg;