diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 00:22:17 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 00:22:17 +0900 |
| commit | ceb8ef5e6dd55ddcfd875262f83c824f01f02181 (patch) | |
| tree | bb2a860519449e5a8b28eefb3f52dbfbbda3529a /arch/arm/plat-samsung | |
| parent | a50345152e9f66e3bc7847c58980b55f5ff7bec4 (diff) | |
| parent | a08485d8fdf6f67ca5f173b68d8f873c574745f2 (diff) | |
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/devs.c | 9 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/devs.h | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 03f654d55ef..7d27a241f98 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -146,15 +146,6 @@ struct platform_device s3c_device_camif = { /* ASOC DMA */ -struct platform_device samsung_asoc_dma = { - .name = "samsung-audio", - .id = -1, - .dev = { - .dma_mask = &samsung_device_dma_mask, - .coherent_dma_mask = DMA_BIT_MASK(32), - } -}; - struct platform_device samsung_asoc_idma = { .name = "samsung-idma", .id = -1, diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index 5da4b4f38f4..c45f70cbbfb 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h @@ -135,7 +135,6 @@ extern struct platform_device exynos4_device_spdif; extern struct platform_device exynos_device_drm; -extern struct platform_device samsung_asoc_dma; extern struct platform_device samsung_asoc_idma; extern struct platform_device samsung_device_keypad; |