summaryrefslogtreecommitdiffstats
path: root/arch/sh/boards/mach-se
diff options
context:
space:
mode:
authorTakashi Iwai2011-01-13 08:37:24 +0100
committerTakashi Iwai2011-01-13 08:37:24 +0100
commit6db9a0f326d3144d790d9479309df480a8f562e4 (patch)
tree650a8950c35c087278ecee1b8d123f75f601ebc8 /arch/sh/boards/mach-se
parentMerge branch 'topic/hda' into for-linus (diff)
parentMerge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff)
downloadkernel-qcow2-linux-6db9a0f326d3144d790d9479309df480a8f562e4.tar.gz
kernel-qcow2-linux-6db9a0f326d3144d790d9479309df480a8f562e4.tar.xz
kernel-qcow2-linux-6db9a0f326d3144d790d9479309df480a8f562e4.zip
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'arch/sh/boards/mach-se')
-rw-r--r--arch/sh/boards/mach-se/7724/setup.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 527a0cd956b5..b710757c33c3 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -318,6 +318,10 @@ static struct platform_device fsi_device = {
},
};
+static struct platform_device fsi_ak4642_device = {
+ .name = "sh_fsi_a_ak4642",
+};
+
/* KEYSC in SoC (Needs SW33-2 set to ON) */
static struct sh_keysc_info keysc_info = {
.mode = SH_KEYSC_MODE_1,
@@ -590,6 +594,7 @@ static struct platform_device *ms7724se_devices[] __initdata = {
&sh7724_usb0_host_device,
&sh7724_usb1_gadget_device,
&fsi_device,
+ &fsi_ak4642_device,
&sdhi0_cn7_device,
&sdhi1_cn8_device,
&irda_device,