diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-15 09:56:40 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-15 09:56:40 -0400 |
commit | ec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1 (patch) | |
tree | c7fcfd4ad7ad1875e611db3a2bd75d64f603c355 /sound/soc/codecs/ad1980.c | |
parent | 6bfb6aa91f61f2a7c526a6353c8c50676ca528da (diff) | |
parent | a532f97c71c7a952531e02b0994104c532fbef0f (diff) |
Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.37
Trivial overlap with the removal of the local revision variable.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'sound/soc/codecs/ad1980.c')
-rw-r--r-- | sound/soc/codecs/ad1980.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c index 1371afac657..81a44404993 100644 --- a/sound/soc/codecs/ad1980.c +++ b/sound/soc/codecs/ad1980.c | |||
@@ -11,6 +11,14 @@ | |||
11 | * option) any later version. | 11 | * option) any later version. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | /* | ||
15 | * WARNING: | ||
16 | * | ||
17 | * Because Analog Devices Inc. discontinued the ad1980 sound chip since | ||
18 | * Sep. 2009, this ad1980 driver is not maintained, tested and supported | ||
19 | * by ADI now. | ||
20 | */ | ||
21 | |||
14 | #include <linux/init.h> | 22 | #include <linux/init.h> |
15 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
16 | #include <linux/module.h> | 24 | #include <linux/module.h> |
@@ -283,6 +291,6 @@ static void __exit ad1980_exit(void) | |||
283 | } | 291 | } |
284 | module_exit(ad1980_exit); | 292 | module_exit(ad1980_exit); |
285 | 293 | ||
286 | MODULE_DESCRIPTION("ASoC ad1980 driver"); | 294 | MODULE_DESCRIPTION("ASoC ad1980 driver (Obsolete)"); |
287 | MODULE_AUTHOR("Roy Huang, Cliff Cai"); | 295 | MODULE_AUTHOR("Roy Huang, Cliff Cai"); |
288 | MODULE_LICENSE("GPL"); | 296 | MODULE_LICENSE("GPL"); |