Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[mv-sheeva.git] / sound / pci / aw2 / aw2-saa7146.c

diff --git a/sound/pci/aw2/aw2-saa7146.c b/sound/pci/aw2/aw2-saa7146.c
index f20f213489a3d50809e9fbf87ae2db33ba753803..296123ab74f7e94b6c911fc52eb852a760e26b6b 100644 (file)
--- a/sound/pci/aw2/aw2-saa7146.c
+++ b/sound/pci/aw2/aw2-saa7146.c
@@ -35,10 +35,11 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 
-#include "aw2-tsl.h"
 #include "saa7146.h"
 #include "aw2-saa7146.h"
 
+#include "aw2-tsl.c"
+
 #define WRITEREG(value, addr) writel((value), chip->base_addr + (addr))
 #define READREG(addr) readl(chip->base_addr + (addr))
 
@@ -107,7 +108,7 @@ void snd_aw2_saa7146_setup(struct snd_aw2_saa7146 *chip,
 #endif
        /* WS0_CTRL, WS0_SYNC: input TSL1, I2S */
 
-       /* At initialization WS1 and WS2 are disbaled (configured as input */
+       /* At initialization WS1 and WS2 are disabled (configured as input) */
        acon1 |= 0 * WS1_CTRL;
        acon1 |= 0 * WS2_CTRL;