summaryrefslogtreecommitdiff
path: root/arch/arm/plat-samsung/devs.c
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-03-11 06:21:36 (GMT)
committerKukjin Kim <kgene.kim@samsung.com>2012-03-11 06:21:36 (GMT)
commitc15a04338b5a6d4305d107a5b6c0cd43418b7f3e (patch)
tree04d40a3b4fbc0477aa71c11044a20ff2d6666004 /arch/arm/plat-samsung/devs.c
parent192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff)
parent60571f98d292b74586ff8330d8bc965eb01e8df0 (diff)
downloadlinux-c15a04338b5a6d4305d107a5b6c0cd43418b7f3e.tar.xz
Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock
Diffstat (limited to 'arch/arm/plat-samsung/devs.c')
-rw-r--r--arch/arm/plat-samsung/devs.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index f10768e..98b8647 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -744,17 +744,6 @@ struct platform_device s3c_device_iis = {
};
#endif /* CONFIG_PLAT_S3C24XX */
-#ifdef CONFIG_CPU_S3C2440
-struct platform_device s3c2412_device_iis = {
- .name = "s3c2412-iis",
- .id = -1,
- .dev = {
- .dma_mask = &samsung_device_dma_mask,
- .coherent_dma_mask = DMA_BIT_MASK(32),
- }
-};
-#endif /* CONFIG_CPU_S3C2440 */
-
/* IDE CFCON */
#ifdef CONFIG_SAMSUNG_DEV_IDE
@@ -1078,7 +1067,7 @@ static struct resource s5p_pmu_resource[] = {
DEFINE_RES_IRQ(IRQ_PMU)
};
-struct platform_device s5p_device_pmu = {
+static struct platform_device s5p_device_pmu = {
.name = "arm-pmu",
.id = ARM_PMU_DEVICE_CPU,
.num_resources = ARRAY_SIZE(s5p_pmu_resource),