Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 10 insertions, 1 deletions

diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig
index 16ec2a2dba4d..8f49e165f4d1 100644
--- a/sound/soc/kirkwood/Kconfig
+++ b/sound/soc/kirkwood/Kconfig
@@ -11,10 +11,19 @@ config SND_KIRKWOOD_SOC_I2S
 
 config SND_KIRKWOOD_SOC_OPENRD
         tristate "SoC Audio support for Kirkwood Openrd Client"
-        depends on SND_KIRKWOOD_SOC && MACH_OPENRD_CLIENT
+        depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE)
         select SND_KIRKWOOD_SOC_I2S
         select SND_SOC_CS42L51
         help
           Say Y if you want to add support for SoC audio on
           Openrd Client.
 
+config SND_KIRKWOOD_SOC_T5325
+        tristate "SoC Audio support for HP t5325"
+        depends on SND_KIRKWOOD_SOC && MACH_T5325
+        select SND_KIRKWOOD_SOC_I2S
+        select SND_SOC_ALC5623
+        help
+          Say Y if you want to add support for SoC audio on
+          the HP t5325 thin client.
+