Merge by hand (whitespace conflicts in libata.h)

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 17 insertions, 0 deletions

diff --git a/include/media/audiochip.h b/include/media/audiochip.h
index a7ceee9fc5e9..b7d4b0930408 100644
--- a/include/media/audiochip.h
+++ b/include/media/audiochip.h
@@ -4,6 +4,23 @@
 #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
+};
+
 /* ---------------------------------------------------------------------- */
 
 /* v4l device was opened in Radio mode */