Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / include / media / audiochip.h

diff --git a/include/media/audiochip.h b/include/media/audiochip.h
index 295d256ee811c63f5b533906851926d63a2ab1e8..1fd4a2207574670846c9a85fbd43e99564d4e543 100644 (file)
--- a/include/media/audiochip.h
+++ b/include/media/audiochip.h
@@ -21,18 +21,4 @@ enum audiochip {
        AUDIO_CHIP_MSP34XX
 };
 
-/* ---------------------------------------------------------------------- */
-
-/* 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
-
 #endif /* AUDIOCHIP_H */