diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-19 20:52:33 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-20 10:07:48 +0000 |
| commit | bde755679a3ba5af0d16231f8532e8373c5e2ecc (patch) | |
| tree | 782fa01306ada3e084bd3c47ea1af378b97c0e16 /arch/arm/plat-samsung/devs.c | |
| parent | 62a16d025c683fe9e1eada7683095013b96ce9d1 (diff) | |
| parent | 44b2cef5ae6da48523fa634230ca66107110a7dd (diff) | |
| download | blackbird-op-linux-bde755679a3ba5af0d16231f8532e8373c5e2ecc.tar.gz blackbird-op-linux-bde755679a3ba5af0d16231f8532e8373c5e2ecc.zip | |
Merge branch 'samsung/cleanup-exynos-clock' into next/soc
Conflicts:
arch/arm/mach-exynos/clock-exynos4.c
arch/arm/mach-exynos/clock.c
The cleanup moves the exynos4 clock implementation away, while
the other branch modifies the file with the old name.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-samsung/devs.c')
| -rw-r--r-- | arch/arm/plat-samsung/devs.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 45d8e5c53ea5..8b928f9bc1c3 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -791,17 +791,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 @@ -1125,7 +1114,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), |
