diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-18 08:03:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-18 08:03:55 -0800 |
| commit | 34c682adb30e9602e92f044056c142f69b4a6cfe (patch) | |
| tree | a57e83edadf6cd34b1966c7e10d7ef6de4bf5313 /arch/arm/mach-s5pv210/mach-smdkc110.c | |
| parent | 8dec00059ef1db9f58719186366b71c8afbc4d1e (diff) | |
| parent | fbcb44dea89063d72a1242086f4a0c618e0d1e81 (diff) | |
Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S5PV310: Add missing virtual ASoC DMA device
ARM: S5PV210: Add missing virtual ASoC DMA device
ARM: S5P6450: Add missing virtual ASoC DMA device
ARM: S5P6440: Add missing virtual ASoC DMA device
ARM: S5P6442: Enable I2S device to work on SMDK6442
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-smdkc110.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkc110.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c index bb20a14da10..ce11a02eabf 100644 --- a/arch/arm/mach-s5pv210/mach-smdkc110.c +++ b/arch/arm/mach-s5pv210/mach-smdkc110.c @@ -81,6 +81,7 @@ static struct s3c_ide_platdata smdkc110_ide_pdata __initdata = { }; static struct platform_device *smdkc110_devices[] __initdata = { + &samsung_asoc_dma, &s5pv210_device_iis0, &s5pv210_device_ac97, &s5pv210_device_spdif, |