aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-05-29 05:59:45 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-17 07:48:03 -0400
commit33001010013749886eca5b5645efd80006dd2e51 (patch)
treee9fce4f64409b50f29814a2f1add69b9584a2fcb /drivers/media/usb
parent7486af1ae3ee34b12fcff1b1ce3a9cc6a2eca03a (diff)
[media] tveeprom: remove v4l2-chip-ident.h include
Replace the V4L2_IDENT_* usage with tveeprom-specific defines. This header is deprecated, so those defines shouldn't be used anymore. The em28xx driver is the only one that uses the tveeprom audio_processor field, so that has been updated to use the new tveeprom AUDPROC define. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb')
-rw-r--r--drivers/media/usb/em28xx/em28xx-cards.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 927956b4dca7..e4b0669d49dd 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -37,7 +37,6 @@
37#include <media/i2c-addr.h> 37#include <media/i2c-addr.h>
38#include <media/tveeprom.h> 38#include <media/tveeprom.h>
39#include <media/v4l2-common.h> 39#include <media/v4l2-common.h>
40#include <media/v4l2-chip-ident.h>
41 40
42#include "em28xx.h" 41#include "em28xx.h"
43 42
@@ -2669,7 +2668,7 @@ static void em28xx_card_setup(struct em28xx *dev)
2669 2668
2670 dev->tuner_type = tv.tuner_type; 2669 dev->tuner_type = tv.tuner_type;
2671 2670
2672 if (tv.audio_processor == V4L2_IDENT_MSPX4XX) { 2671 if (tv.audio_processor == TVEEPROM_AUDPROC_MSP) {
2673 dev->i2s_speed = 2048000; 2672 dev->i2s_speed = 2048000;
2674 dev->board.has_msp34xx = 1; 2673 dev->board.has_msp34xx = 1;
2675 } 2674 }