umem: Fix match of pci_ids in umem driver

[sfrench/cifs-2.6.git] / include / media / audiochip.h

diff --git a/include/media/audiochip.h b/include/media/audiochip.h
index b7d4b0930408c3e366e28de0a196387bd03a743d..db8823d45a7d7936fc855706787bfce855cf723c 100644 (file)
--- a/include/media/audiochip.h
+++ b/include/media/audiochip.h
@@ -18,37 +18,9 @@ enum audiochip {
        AUDIO_CHIP_TDA9874,
        AUDIO_CHIP_PIC16C54,
        /* Provided by msp3400.c */
-       AUDIO_CHIP_MSP34XX
+       AUDIO_CHIP_MSP34XX,
+       /* Provided by wm8775.c */
+       AUDIO_CHIP_WM8775
 };
 
-/* ---------------------------------------------------------------------- */
-
-/* v4l device was opened in Radio mode */
-#define AUDC_SET_RADIO        _IO('m',2)
-/* select from TV,radio,extern,MUTE */
-#define AUDC_SET_INPUT        _IOW('m',17,int)
-
-/* audio inputs */
-#define AUDIO_TUNER        0x00
-#define AUDIO_RADIO        0x01
-#define AUDIO_EXTERN       0x02
-#define AUDIO_INTERN       0x03
-#define AUDIO_OFF          0x04
-#define AUDIO_ON           0x05
-#define AUDIO_EXTERN_1     AUDIO_EXTERN
-#define AUDIO_EXTERN_2     0x06
-#define AUDIO_MUTE         0x80
-#define AUDIO_UNMUTE       0x81
-
-/* all the stuff below is obsolete and just here for reference.  I'll
- * remove it once the driver is tested and works fine.
- *
- * Instead creating alot of tiny API's for all kinds of different
- * chips, we'll just pass throuth the v4l ioctl structs (v4l2 not
- * yet...).  It is a bit less flexible, but most/all used i2c chips
- * make sense in v4l context only.  So I think that's acceptable...
- */
-
-/* misc stuff to pass around config info to i2c chips */
-#define AUDC_CONFIG_PINNACLE  _IOW('m',32,int)
 #endif /* AUDIOCHIP_H */