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/arm/mach-s3c64xx/mach-smdk6410.c | |
| parent | c400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38 (diff) | |
| parent | 18b022eb117e7f70c191267551ff865f278a9258 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-smdk6410.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index 77488facfe4c..e85192a86fbe 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c | |||
| @@ -283,7 +283,7 @@ static struct platform_device *smdk6410_devices[] __initdata = { | |||
| 283 | &s3c_device_fb, | 283 | &s3c_device_fb, |
| 284 | &s3c_device_ohci, | 284 | &s3c_device_ohci, |
| 285 | &s3c_device_usb_hsotg, | 285 | &s3c_device_usb_hsotg, |
| 286 | &s3c_device_pcm, | 286 | &samsung_asoc_dma, |
| 287 | &s3c64xx_device_iisv4, | 287 | &s3c64xx_device_iisv4, |
| 288 | &samsung_device_keypad, | 288 | &samsung_device_keypad, |
| 289 | 289 | ||