diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
| commit | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch) | |
| tree | 869d633803eb7c429624d3bd16a6117816849763 /sound/soc | |
| parent | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff) | |
| parent | b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/fsl/efika-audio-fabric.c | 2 | ||||
| -rw-r--r-- | sound/soc/fsl/pcm030-audio-fabric.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/fsl/efika-audio-fabric.c b/sound/soc/fsl/efika-audio-fabric.c index 85b0e7569504..3326e2a1e863 100644 --- a/sound/soc/fsl/efika-audio-fabric.c +++ b/sound/soc/fsl/efika-audio-fabric.c | |||
| @@ -30,6 +30,8 @@ | |||
| 30 | #include "mpc5200_psc_ac97.h" | 30 | #include "mpc5200_psc_ac97.h" |
| 31 | #include "../codecs/stac9766.h" | 31 | #include "../codecs/stac9766.h" |
| 32 | 32 | ||
| 33 | #define DRV_NAME "efika-audio-fabric" | ||
| 34 | |||
| 33 | static struct snd_soc_device device; | 35 | static struct snd_soc_device device; |
| 34 | static struct snd_soc_card card; | 36 | static struct snd_soc_card card; |
| 35 | 37 | ||
diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c index 8766f7a3893d..b928ef7d28eb 100644 --- a/sound/soc/fsl/pcm030-audio-fabric.c +++ b/sound/soc/fsl/pcm030-audio-fabric.c | |||
| @@ -30,6 +30,8 @@ | |||
| 30 | #include "mpc5200_psc_ac97.h" | 30 | #include "mpc5200_psc_ac97.h" |
| 31 | #include "../codecs/wm9712.h" | 31 | #include "../codecs/wm9712.h" |
| 32 | 32 | ||
| 33 | #define DRV_NAME "pcm030-audio-fabric" | ||
| 34 | |||
| 33 | static struct snd_soc_device device; | 35 | static struct snd_soc_device device; |
| 34 | static struct snd_soc_card card; | 36 | static struct snd_soc_card card; |
| 35 | 37 | ||