diff options
Diffstat (limited to 'arch/arm/plat-samsung/devs.c')
-rw-r--r-- | arch/arm/plat-samsung/devs.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 03f654d55eff..51afedda9ab6 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 = { | |||
146 | 146 | ||
147 | /* ASOC DMA */ | 147 | /* ASOC DMA */ |
148 | 148 | ||
149 | struct platform_device samsung_asoc_dma = { | ||
150 | .name = "samsung-audio", | ||
151 | .id = -1, | ||
152 | .dev = { | ||
153 | .dma_mask = &samsung_device_dma_mask, | ||
154 | .coherent_dma_mask = DMA_BIT_MASK(32), | ||
155 | } | ||
156 | }; | ||
157 | |||
158 | struct platform_device samsung_asoc_idma = { | 149 | struct platform_device samsung_asoc_idma = { |
159 | .name = "samsung-idma", | 150 | .name = "samsung-idma", |
160 | .id = -1, | 151 | .id = -1, |
@@ -486,11 +477,7 @@ static struct resource s3c_i2c0_resource[] = { | |||
486 | 477 | ||
487 | struct platform_device s3c_device_i2c0 = { | 478 | struct platform_device s3c_device_i2c0 = { |
488 | .name = "s3c2410-i2c", | 479 | .name = "s3c2410-i2c", |
489 | #ifdef CONFIG_S3C_DEV_I2C1 | ||
490 | .id = 0, | 480 | .id = 0, |
491 | #else | ||
492 | .id = -1, | ||
493 | #endif | ||
494 | .num_resources = ARRAY_SIZE(s3c_i2c0_resource), | 481 | .num_resources = ARRAY_SIZE(s3c_i2c0_resource), |
495 | .resource = s3c_i2c0_resource, | 482 | .resource = s3c_i2c0_resource, |
496 | }; | 483 | }; |
@@ -933,6 +920,7 @@ struct platform_device s5p_device_mfc_r = { | |||
933 | .coherent_dma_mask = DMA_BIT_MASK(32), | 920 | .coherent_dma_mask = DMA_BIT_MASK(32), |
934 | }, | 921 | }, |
935 | }; | 922 | }; |
923 | |||
936 | #endif /* CONFIG_S5P_DEV_MFC */ | 924 | #endif /* CONFIG_S5P_DEV_MFC */ |
937 | 925 | ||
938 | /* MIPI CSIS */ | 926 | /* MIPI CSIS */ |