diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-24 07:10:44 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-08 01:30:37 -0400 |
commit | a9ba615134ad32254fae84f16e1751854755135c (patch) | |
tree | af253bdc450833158c1cac1bc71a484e9ec070bb /sound/soc/codecs/Kconfig | |
parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) |
ASoC: Rename WM8915 to WM8996
For marketing reasons the part will be called WM8996. In order to avoid
user confusion rename the driver to reflect this.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/codecs/Kconfig')
-rw-r--r-- | sound/soc/codecs/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 379b2e3afd98..665d9240c4ae 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
@@ -78,7 +78,6 @@ config SND_SOC_ALL_CODECS | |||
78 | select SND_SOC_WM8900 if I2C | 78 | select SND_SOC_WM8900 if I2C |
79 | select SND_SOC_WM8903 if I2C | 79 | select SND_SOC_WM8903 if I2C |
80 | select SND_SOC_WM8904 if I2C | 80 | select SND_SOC_WM8904 if I2C |
81 | select SND_SOC_WM8915 if I2C | ||
82 | select SND_SOC_WM8940 if I2C | 81 | select SND_SOC_WM8940 if I2C |
83 | select SND_SOC_WM8955 if I2C | 82 | select SND_SOC_WM8955 if I2C |
84 | select SND_SOC_WM8960 if I2C | 83 | select SND_SOC_WM8960 if I2C |
@@ -95,6 +94,7 @@ config SND_SOC_ALL_CODECS | |||
95 | select SND_SOC_WM8993 if I2C | 94 | select SND_SOC_WM8993 if I2C |
96 | select SND_SOC_WM8994 if MFD_WM8994 | 95 | select SND_SOC_WM8994 if MFD_WM8994 |
97 | select SND_SOC_WM8995 if SND_SOC_I2C_AND_SPI | 96 | select SND_SOC_WM8995 if SND_SOC_I2C_AND_SPI |
97 | select SND_SOC_WM8996 if I2C | ||
98 | select SND_SOC_WM9081 if I2C | 98 | select SND_SOC_WM9081 if I2C |
99 | select SND_SOC_WM9090 if I2C | 99 | select SND_SOC_WM9090 if I2C |
100 | select SND_SOC_WM9705 if SND_SOC_AC97_BUS | 100 | select SND_SOC_WM9705 if SND_SOC_AC97_BUS |
@@ -329,9 +329,6 @@ config SND_SOC_WM8903 | |||
329 | config SND_SOC_WM8904 | 329 | config SND_SOC_WM8904 |
330 | tristate | 330 | tristate |
331 | 331 | ||
332 | config SND_SOC_WM8915 | ||
333 | tristate | ||
334 | |||
335 | config SND_SOC_WM8940 | 332 | config SND_SOC_WM8940 |
336 | tristate | 333 | tristate |
337 | 334 | ||
@@ -380,6 +377,9 @@ config SND_SOC_WM8994 | |||
380 | config SND_SOC_WM8995 | 377 | config SND_SOC_WM8995 |
381 | tristate | 378 | tristate |
382 | 379 | ||
380 | config SND_SOC_WM8996 | ||
381 | tristate | ||
382 | |||
383 | config SND_SOC_WM9081 | 383 | config SND_SOC_WM9081 |
384 | tristate | 384 | tristate |
385 | 385 | ||