aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s5pc100
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 00:22:17 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 00:22:17 +0900
commitceb8ef5e6dd55ddcfd875262f83c824f01f02181 (patch)
treebb2a860519449e5a8b28eefb3f52dbfbbda3529a /arch/arm/mach-s5pc100
parenta50345152e9f66e3bc7847c58980b55f5ff7bec4 (diff)
parenta08485d8fdf6f67ca5f173b68d8f873c574745f2 (diff)
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
Diffstat (limited to 'arch/arm/mach-s5pc100')
-rw-r--r--arch/arm/mach-s5pc100/mach-smdkc100.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c
index dba7384a87b..9abe95e806a 100644
--- a/arch/arm/mach-s5pc100/mach-smdkc100.c
+++ b/arch/arm/mach-s5pc100/mach-smdkc100.c
@@ -197,7 +197,6 @@ static struct platform_device *smdkc100_devices[] __initdata = {
&s3c_device_ts,
&s3c_device_wdt,
&smdkc100_lcd_powerdev,
- &samsung_asoc_dma,
&s5pc100_device_iis0,
&samsung_device_keypad,
&s5pc100_device_ac97,