Merge tag 'dt-3.13-4' of git://git.infradead.org/linux-mvebu into next/dt

[firefly-linux-kernel-4.4.55.git] / arch / arm / plat-samsung / platformdata.c

diff --git a/arch/arm/plat-samsung/platformdata.c b/arch/arm/plat-samsung/platformdata.c
index fa78aa710ed1dc0592dc47effd416bc95fd6a1d8..b430e9946287e3c0e2d71481fa83988307243fb4 100644 (file)
--- a/arch/arm/plat-samsung/platformdata.c
+++ b/arch/arm/plat-samsung/platformdata.c
@@ -57,6 +57,4 @@ void s3c_sdhci_set_platdata(struct s3c_sdhci_platdata *pd,
                set->host_caps2 |= pd->host_caps2;
        if (pd->pm_caps)
                set->pm_caps |= pd->pm_caps;
-       if (pd->clk_type)
-               set->clk_type = pd->clk_type;
 }