Merge branch 'topic/asoc' into topic/remove-irqf_disable

1 files changed, 4 insertions, 1 deletions

diff --git a/sound/mips/Kconfig b/sound/mips/Kconfig
index a9823fad85c2..77dd0a13aecc 100644
--- a/sound/mips/Kconfig
+++ b/sound/mips/Kconfig
@@ -23,12 +23,15 @@ config SND_SGI_HAL2
 
 
 config SND_AU1X00
-        tristate "Au1x00 AC97 Port Driver"
+        tristate "Au1x00 AC97 Port Driver (DEPRECATED)"
         depends on SOC_AU1000 || SOC_AU1100 || SOC_AU1500
         select SND_PCM
         select SND_AC97_CODEC
         help
           ALSA Sound driver for the Au1x00's AC97 port.
 
+          Newer drivers for ASoC are available, please do not use
+          this driver as it will be removed in the future.
+
 endif   # SND_MIPS