diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-07 18:51:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-07 18:51:34 +0100 |
| commit | 299a75920379e75069b5c8ef9954408f2085f051 (patch) | |
| tree | 1403cc3a8ae5d31477be76c030b8bdb9007b17a3 /sound/soc/Kconfig | |
| parent | 5409fb4e327a84972483047ecf4fb41f279453e2 (diff) | |
| parent | 80fbe6ac9b47cbc11e174a9bf853834dc281da35 (diff) | |
Merge branch 's6000' into for-2.6.31
Diffstat (limited to 'sound/soc/Kconfig')
| -rw-r--r-- | sound/soc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 3d2bb6fc6dc..3304f9dd92f 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -32,6 +32,7 @@ source "sound/soc/fsl/Kconfig" source "sound/soc/omap/Kconfig" source "sound/soc/pxa/Kconfig" source "sound/soc/s3c24xx/Kconfig" +source "sound/soc/s6000/Kconfig" source "sound/soc/sh/Kconfig" # Supported codecs |