ARM: ux500: Fix merge error, no matching driver name for 'snd_soc_u8500'
authorLee Jones <lee.jones@linaro.org>
Thu, 9 Aug 2012 15:47:27 +0000 (16:47 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 17 Aug 2012 09:21:30 +0000 (11:21 +0200)
commit97f50c6c415d84c612094d9514a3df3d70ab30e3
treea02b094564b7beb4d1a4278f010289ca7748c0bf
parentd9875690d9b89a866022ff49e3fcea892345ad92
ARM: ux500: Fix merge error, no matching driver name for 'snd_soc_u8500'

The platform attempts to register platform device 'snd_soc_u8500'
which doesn't actually exist. Here we change the reference to the
correct one 'snd_soc_mop500'.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
arch/arm/mach-ux500/board-mop500-msp.c