On 22/02/15 12:49, Sascha Hauer wrote:
> From: James Liao <jamesjj.l...@mediatek.com>
> diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h
> new file mode 100644
> index 0000000..c7c0d35
> --- /dev/null
> +++ b/drivers/clk/mediatek/clk-mtk.h
[...]
> +void __init mtk_clk_register_plls(struct device_node *node,
> + const struct mtk_pll_data *plls, int num_plls);
> +
> +#ifdef CONFIG_RESET_CONTROLLER
> +void mtk_register_reset_controller(struct device_node *np,
> + unsigned int num_regs, int regofs);
> +#else
> +static inline void mtk_register_reset_controller(struct device_node *np,
> + unsigned int num_regs, int regofs)
> +{
> +}
> +#endif
This lines should only be added once in [2/5], compiling ends with:
In file included from drivers/clk/mediatek/clk-mtk.c:24:0:
drivers/clk/mediatek/clk-mtk.h:168:20: error: redefinition of
‘mtk_register_reset_controller’
drivers/clk/mediatek/clk-mtk.h:158:20: note: previous definition of
‘mtk_register_reset_controller’ was here
Cheers,
Matthias
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
