summaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile/board-ap4evb.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-15 21:26:43 +0400
committerArnd Bergmann <arnd@arndb.de>2012-03-15 21:33:38 +0400
commit5cd9eb2736a572a9ef2689829f47ffd4262adc00 (patch)
tree380bcc1d77acc968e9ae9c8da9215b8b04edba1f /arch/arm/mach-shmobile/board-ap4evb.c
parenta6e24019468009a21b674e392d74283a90f415dd (diff)
parente49d603c181b6004e2f6b5ad6d86daab84f22fe6 (diff)
downloadlinux-5cd9eb2736a572a9ef2689829f47ffd4262adc00.tar.xz
Merge branch 'renesas/fixes' into renesas/soc
The fixes branch was merged into mainline just after v3.3-rc7, I'm merging it into this branch to fix up a nontrivial merge conflict. Unfortunately this means that we are now based on a commit between -rc releases, which we normally try to avoid. Conflicts: arch/arm/mach-shmobile/board-mackerel.c Resolution suggested by Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-shmobile/board-ap4evb.c')
-rw-r--r--arch/arm/mach-shmobile/board-ap4evb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index d07ec186a6cf..4739f039650a 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -792,7 +792,7 @@ static struct fsi_ak4642_info fsi2_ak4643_info = {
static struct platform_device fsi_ak4643_device = {
.name = "fsi-ak4642-audio",
.dev = {
- .platform_data = &fsi_info,
+ .platform_data = &fsi2_ak4643_info,
},
};