diff --git a/[refs] b/[refs]
index 8434d795cd4d..e24ab67e4a0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2ce305dda483e59a78d5aa6e4211034c0cea38d
+refs/heads/master: 7137c6bcb7ff5d0e6f63f8a4175d5b77dc79abc0
diff --git a/trunk/sound/mips/Kconfig b/trunk/sound/mips/Kconfig
index a9823fad85c2..77dd0a13aecc 100644
--- a/trunk/sound/mips/Kconfig
+++ b/trunk/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