diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 11:33:59 (GMT) |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-27 22:18:19 (GMT) |
commit | a754a87ce8b17024358c1be8ee0232ef09a7055f (patch) | |
tree | c0d4adee8f490828ca04cd45d6fbb13596d88322 /sound/soc/fsl/fsl_ssi.c | |
parent | 70688056a8b4d610249716befe262a74fd123d90 (diff) | |
parent | 22f8d055350066b4a87de4adea8c5213cac54534 (diff) | |
download | linux-fsl-qoriq-a754a87ce8b17024358c1be8ee0232ef09a7055f.tar.xz |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards
The asoc branch that was already merged into v3.4 contains some
board-level changes that conflict with patches we already have
here, so pull in that branch to resolve the conflicts.
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
arch/arm/mach-omap2/board-omap4panda.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[olof: Amended fix for mismerge as reported by Kevin Hilman]
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'sound/soc/fsl/fsl_ssi.c')
-rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 3e06696..2eb407f 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -716,12 +716,12 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev) } /* Trigger the machine driver's probe function. The platform driver - * name of the machine driver is taken from the /model property of the + * name of the machine driver is taken from /compatible property of the * device tree. We also pass the address of the CPU DAI driver * structure. */ - sprop = of_get_property(of_find_node_by_path("/"), "model", NULL); - /* Sometimes the model name has a "fsl," prefix, so we strip that. */ + sprop = of_get_property(of_find_node_by_path("/"), "compatible", NULL); + /* Sometimes the compatible name has a "fsl," prefix, so we strip it. */ p = strrchr(sprop, ','); if (p) sprop = p + 1; |