From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sascha Hauer Subject: Re: [PATCH 1/5] clk: mediatek: Add initial common clock support for Mediatek SoCs. Date: Mon, 16 Mar 2015 06:34:19 +0100 Message-ID: <20150316053419.GE24798@pengutronix.de> References: <1424605765-19751-1-git-send-email-s.hauer@pengutronix.de> <1424605765-19751-2-git-send-email-s.hauer@pengutronix.de> <55031468.2040109@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <55031468.2040109@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: Matthias Brugger Cc: Mike Turquette , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, YH Chen , kernel@pengutronix.de, Yingjoe Chen , Eddie Huang , Henry Chen , James Liao List-Id: linux-mediatek@lists.infradead.org On Fri, Mar 13, 2015 at 05:46:32PM +0100, Matthias Brugger wrote: >=20 >=20 > On 22/02/15 12:49, Sascha Hauer wrote: > > From: James Liao >=20 > > 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 >=20 > [...] >=20 > > +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_nod= e *np, > > + unsigned int num_regs, int regofs) > > +{ > > +} > > +#endif >=20 > This lines should only be added once in [2/5], compiling ends with: >=20 > In file included from drivers/clk/mediatek/clk-mtk.c:24:0: > drivers/clk/mediatek/clk-mtk.h:168:20: error: redefinition of =E2=80=98= mtk_register_reset_controller=E2=80=99 > drivers/clk/mediatek/clk-mtk.h:158:20: note: previous definition of =E2= =80=98mtk_register_reset_controller=E2=80=99 was here Hm, seems to be a rebase accident. Fixed, thanks Sascha --=20 Pengutronix e.K. | = | Industrial Linux Solutions | http://www.pengutronix.de/= | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 = | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-555= 5 |