]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2f2a0c5) | patch
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)
commit41a1664f9be4f9f612c40ea85beb60a5f3ba0a8f
treea02b094564b7beb4d1a4278f010289ca7748c0bftree | snapshot
parent2f2a0c5f4b60dcf2d8db567191c7178e461721c8commit | diff
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 diff | blob | history
Linux Kernel Source Tree.