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-s5p64x0 | |
parent | a50345152e9f66e3bc7847c58980b55f5ff7bec4 (diff) | |
parent | a08485d8fdf6f67ca5f173b68d8f873c574745f2 (diff) |
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
Diffstat (limited to 'arch/arm/mach-s5p64x0')
-rw-r--r-- | arch/arm/mach-s5p64x0/mach-smdk6440.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s5p64x0/mach-smdk6450.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c index 96ea1fe0ec94..1af823558c60 100644 --- a/arch/arm/mach-s5p64x0/mach-smdk6440.c +++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c | |||
@@ -165,7 +165,6 @@ static struct platform_device *smdk6440_devices[] __initdata = { | |||
165 | &s3c_device_i2c1, | 165 | &s3c_device_i2c1, |
166 | &s3c_device_ts, | 166 | &s3c_device_ts, |
167 | &s3c_device_wdt, | 167 | &s3c_device_wdt, |
168 | &samsung_asoc_dma, | ||
169 | &s5p6440_device_iis, | 168 | &s5p6440_device_iis, |
170 | &s3c_device_fb, | 169 | &s3c_device_fb, |
171 | &smdk6440_lcd_lte480wv, | 170 | &smdk6440_lcd_lte480wv, |
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c index 12748b6eaa7b..62526ccf6b70 100644 --- a/arch/arm/mach-s5p64x0/mach-smdk6450.c +++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c | |||
@@ -183,7 +183,6 @@ static struct platform_device *smdk6450_devices[] __initdata = { | |||
183 | &s3c_device_i2c1, | 183 | &s3c_device_i2c1, |
184 | &s3c_device_ts, | 184 | &s3c_device_ts, |
185 | &s3c_device_wdt, | 185 | &s3c_device_wdt, |
186 | &samsung_asoc_dma, | ||
187 | &s5p6450_device_iis0, | 186 | &s5p6450_device_iis0, |
188 | &s3c_device_fb, | 187 | &s3c_device_fb, |
189 | &smdk6450_lcd_lte480wv, | 188 | &smdk6450_lcd_lte480wv, |