diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:17 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:17 -0500 |
| commit | ceb8ef5e6dd55ddcfd875262f83c824f01f02181 (patch) | |
| tree | bb2a860519449e5a8b28eefb3f52dbfbbda3529a /arch/arm/mach-s5pc100 | |
| parent | a50345152e9f66e3bc7847c58980b55f5ff7bec4 (diff) | |
| parent | a08485d8fdf6f67ca5f173b68d8f873c574745f2 (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.c | 1 |
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 dba7384a87bd..9abe95e806ab 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 = { | |||
| 197 | &s3c_device_ts, | 197 | &s3c_device_ts, |
| 198 | &s3c_device_wdt, | 198 | &s3c_device_wdt, |
| 199 | &smdkc100_lcd_powerdev, | 199 | &smdkc100_lcd_powerdev, |
| 200 | &samsung_asoc_dma, | ||
| 201 | &s5pc100_device_iis0, | 200 | &s5pc100_device_iis0, |
| 202 | &samsung_device_keypad, | 201 | &samsung_device_keypad, |
| 203 | &s5pc100_device_ac97, | 202 | &s5pc100_device_ac97, |