diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-05-26 12:56:06 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-21 15:30:38 +0200 |
| commit | facd23664f1d63c33fbc6da52261c8548ed3fbd4 (patch) | |
| tree | d48f7a734ea47cec17f156c124ebf67de4d7c754 /drivers/media/pci/cx88/cx88.h | |
| parent | Merge branch 'linus' into patchwork (diff) | |
| download | linux-facd23664f1d63c33fbc6da52261c8548ed3fbd4.tar.xz linux-facd23664f1d63c33fbc6da52261c8548ed3fbd4.zip | |
[media] cx88: remove g_chip_ident
Remove g_chip_ident from cx88. Also remove the v4l2-chip-ident.h include.
The board code used defines from v4l2-chip-ident.h to tell the driver which
audio chip is used. Replace this with a cx88-specific enum.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/cx88/cx88.h')
| -rw-r--r-- | drivers/media/pci/cx88/cx88.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h index 51ce2c0e8bc1..afe0eaea81b4 100644 --- a/drivers/media/pci/cx88/cx88.h +++ b/drivers/media/pci/cx88/cx88.h @@ -30,7 +30,6 @@ #include <media/tuner.h> #include <media/tveeprom.h> #include <media/videobuf-dma-sg.h> -#include <media/v4l2-chip-ident.h> #include <media/cx2341x.h> #include <media/videobuf-dvb.h> #include <media/ir-kbd-i2c.h> @@ -259,6 +258,11 @@ struct cx88_input { unsigned int audioroute:4; }; +enum cx88_audio_chip { + CX88_AUDIO_WM8775, + CX88_AUDIO_TVAUDIO, +}; + struct cx88_board { const char *name; unsigned int tuner_type; @@ -269,7 +273,7 @@ struct cx88_board { struct cx88_input input[MAX_CX88_INPUT]; struct cx88_input radio; enum cx88_board_type mpeg; - unsigned int audio_chip; + enum cx88_audio_chip audio_chip; int num_frontends; /* Used for I2S devices */ |