diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-09-17 21:08:53 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-09-17 21:08:53 +0200 |
| commit | 673bca1906334972c2b54e7c7c002941329039cd (patch) | |
| tree | 255d7e793cf75d6ebcd52f8c8fc6683bae398cf6 /sound/soc/codecs | |
| parent | 1110afbe728838ac7ce973c37af9e11385dbaef9 (diff) | |
| parent | d4e54e871f4d2ca29df081abf8e0d5209d252979 (diff) | |
| download | linux-673bca1906334972c2b54e7c7c002941329039cd.tar.gz linux-673bca1906334972c2b54e7c7c002941329039cd.tar.bz2 linux-673bca1906334972c2b54e7c7c002941329039cd.zip | |
Merge branch 'fix/asoc' into for-linus
* fix/asoc:
ASoC: remove unused #include <linux/version.h>
ASoC: S3C lrsync function made to work with IRQs disabled.
ASoC: Fix display of stream name in DAPM debugfs
ASoC: Clean up error handling in MPC5200 DMA setup
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/ad1836.c | 1 | ||||
| -rw-r--r-- | sound/soc/codecs/ad1938.c | 1 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8974.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c index 3612bb92df90..01343dc984fd 100644 --- a/sound/soc/codecs/ad1836.c +++ b/sound/soc/codecs/ad1836.c @@ -18,7 +18,6 @@ #include <linux/init.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/kernel.h> #include <linux/device.h> #include <sound/core.h> diff --git a/sound/soc/codecs/ad1938.c b/sound/soc/codecs/ad1938.c index e62b27701a49..9a049a1995a3 100644 --- a/sound/soc/codecs/ad1938.c +++ b/sound/soc/codecs/ad1938.c @@ -28,7 +28,6 @@ #include <linux/init.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/kernel.h> #include <linux/device.h> #include <sound/core.h> diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index d8a013ab3177..98d663afc97d 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -12,7 +12,6 @@ #include <linux/module.h> #include <linux/moduleparam.h> -#include <linux/version.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/delay.h> |