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.h | |
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.h')
-rw-r--r-- | sound/soc/codecs/ad1980.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/codecs/ad1980.h b/sound/soc/codecs/ad1980.h index 29b5a8750926..eb0af44ad3df 100644 --- a/sound/soc/codecs/ad1980.h +++ b/sound/soc/codecs/ad1980.h | |||
@@ -1,5 +1,11 @@ | |||
1 | /* | 1 | /* |
2 | * ad1980.h -- ad1980 Soc Audio driver | 2 | * ad1980.h -- ad1980 Soc Audio driver |
3 | * | ||
4 | * WARNING: | ||
5 | * | ||
6 | * Because Analog Devices Inc. discontinued the ad1980 sound chip since | ||
7 | * Sep. 2009, this ad1980 driver is not maintained, tested and supported | ||
8 | * by ADI now. | ||
3 | */ | 9 | */ |
4 | 10 | ||
5 | #ifndef _AD1980_H | 11 | #ifndef _AD1980_H |