diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-01-13 02:37:24 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-01-13 02:37:24 -0500 |
commit | 6db9a0f326d3144d790d9479309df480a8f562e4 (patch) | |
tree | 650a8950c35c087278ecee1b8d123f75f601ebc8 /arch/sh | |
parent | c400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38 (diff) | |
parent | 18b022eb117e7f70c191267551ff865f278a9258 (diff) |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/boards/mach-se/7724/setup.c | 5 |
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 = { | |||
318 | }, | 318 | }, |
319 | }; | 319 | }; |
320 | 320 | ||
321 | static struct platform_device fsi_ak4642_device = { | ||
322 | .name = "sh_fsi_a_ak4642", | ||
323 | }; | ||
324 | |||
321 | /* KEYSC in SoC (Needs SW33-2 set to ON) */ | 325 | /* KEYSC in SoC (Needs SW33-2 set to ON) */ |
322 | static struct sh_keysc_info keysc_info = { | 326 | static struct sh_keysc_info keysc_info = { |
323 | .mode = SH_KEYSC_MODE_1, | 327 | .mode = SH_KEYSC_MODE_1, |
@@ -590,6 +594,7 @@ static struct platform_device *ms7724se_devices[] __initdata = { | |||
590 | &sh7724_usb0_host_device, | 594 | &sh7724_usb0_host_device, |
591 | &sh7724_usb1_gadget_device, | 595 | &sh7724_usb1_gadget_device, |
592 | &fsi_device, | 596 | &fsi_device, |
597 | &fsi_ak4642_device, | ||
593 | &sdhi0_cn7_device, | 598 | &sdhi0_cn7_device, |
594 | &sdhi1_cn8_device, | 599 | &sdhi1_cn8_device, |
595 | &irda_device, | 600 | &irda_device, |