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-s3c2440 | |
| parent | c400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38 (diff) | |
| parent | 18b022eb117e7f70c191267551ff865f278a9258 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-s3c2440')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-rx1950.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-rx1950.c b/arch/arm/mach-s3c2440/mach-rx1950.c index e0622bbb6dfa..eab6ae50683c 100644 --- a/arch/arm/mach-s3c2440/mach-rx1950.c +++ b/arch/arm/mach-s3c2440/mach-rx1950.c | |||
| @@ -692,7 +692,7 @@ static struct platform_device *rx1950_devices[] __initdata = { | |||
| 692 | &s3c_device_wdt, | 692 | &s3c_device_wdt, |
| 693 | &s3c_device_i2c0, | 693 | &s3c_device_i2c0, |
| 694 | &s3c_device_iis, | 694 | &s3c_device_iis, |
| 695 | &s3c_device_pcm, | 695 | &samsung_asoc_dma, |
| 696 | &s3c_device_usbgadget, | 696 | &s3c_device_usbgadget, |
| 697 | &s3c_device_rtc, | 697 | &s3c_device_rtc, |
| 698 | &s3c_device_nand, | 698 | &s3c_device_nand, |