V4L/DVB (8477): v4l: remove obsolete audiochip.h

Converted the last users of audiochip.h to the v4l2-chip-ident.h header
and remove the now unused audiochip.h header.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 5 insertions, 28 deletions

diff --git a/include/media/audiochip.h b/include/media/audiochip.h
index db8823d45a7d..e69de29bb2d1 100644
--- a/include/media/audiochip.h
+++ b/include/media/audiochip.h
@@ -1,26 +0,0 @@
-/*
- */
-
-#ifndef AUDIOCHIP_H
-#define AUDIOCHIP_H
-
-enum audiochip {
-        AUDIO_CHIP_NONE,
-        AUDIO_CHIP_UNKNOWN,
-        /* Provided by video chip */
-        AUDIO_CHIP_INTERNAL,
-        /* Provided by tvaudio.c */
-        AUDIO_CHIP_TDA8425,
-        AUDIO_CHIP_TEA6300,
-        AUDIO_CHIP_TEA6420,
-        AUDIO_CHIP_TDA9840,
-        AUDIO_CHIP_TDA985X,
-        AUDIO_CHIP_TDA9874,
-        AUDIO_CHIP_PIC16C54,
-        /* Provided by msp3400.c */
-        AUDIO_CHIP_MSP34XX,
-        /* Provided by wm8775.c */
-        AUDIO_CHIP_WM8775
-};
-
-#endif /* AUDIOCHIP_H */
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 2a527742701a..41b509babf3f 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -90,7 +90,10 @@ enum {
         /* module m52790: just ident 52790 */
         V4L2_IDENT_M52790 = 52790,
 
-        /* module msp34xx: reserved range 34000-34999 */
+        /* module msp3400: reserved range 34000-34999 and 44000-44999 */
+        V4L2_IDENT_MSPX4XX  = 34000, /* generic MSPX4XX identifier, only
+                                        use internally (tveeprom.c). */
+
         V4L2_IDENT_MSP3400B = 34002,
         V4L2_IDENT_MSP3410B = 34102,
 
@@ -142,7 +145,7 @@ enum {
         V4L2_IDENT_MSP3457G = 34577,
         V4L2_IDENT_MSP3467G = 34677,
 
-        /* module msp44xx: reserved range 44000-44999 */
+        /* module msp3400: reserved range 34000-34999 and 44000-44999 */
         V4L2_IDENT_MSP4400G = 44007,
         V4L2_IDENT_MSP4410G = 44107,
         V4L2_IDENT_MSP4420G = 44207,