Merge branches 'iommu/fixes', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'arm/mediatek...

[karo-tx-linux.git] / drivers / clk / sunxi-ng / ccu_mp.h

diff --git a/drivers/clk/sunxi-ng/ccu_mp.h b/drivers/clk/sunxi-ng/ccu_mp.h
index 3cf12bf95962330e473340cbc38e511e54263f87..915625e97d98b6ab72753486207dedf0b61fe310 100644 (file)
--- a/drivers/clk/sunxi-ng/ccu_mp.h
+++ b/drivers/clk/sunxi-ng/ccu_mp.h
@@ -29,8 +29,8 @@
 struct ccu_mp {
        u32                     enable;
 
-       struct _ccu_div         m;
-       struct _ccu_div         p;
+       struct ccu_div_internal         m;
+       struct ccu_div_internal         p;
        struct ccu_mux_internal mux;
        struct ccu_common       common;
 };
@@ -44,7 +44,7 @@ struct ccu_mp {
                .enable = _gate,                                        \
                .m      = _SUNXI_CCU_DIV(_mshift, _mwidth),             \
                .p      = _SUNXI_CCU_DIV(_pshift, _pwidth),             \
-               .mux    = SUNXI_CLK_MUX(_muxshift, _muxwidth),          \
+               .mux    = _SUNXI_CCU_MUX(_muxshift, _muxwidth),         \
                .common = {                                             \
                        .reg            = _reg,                         \
                        .hw.init        = CLK_HW_INIT_PARENTS(_name,    \