Hi Simon, On Thu, Feb 06, 2014 at 04:25:57PM +0900, Simon Horman wrote: > On Thu, Feb 06, 2014 at 09:18:21AM +0200, Baruch Siach wrote: > > On Thu, Feb 06, 2014 at 03:40:56PM +0900, Simon Horman wrote: > > > On Wed, Feb 05, 2014 at 09:28:38PM +0200, Baruch Siach wrote: > > > > Since 93abe8e4 (clk: add non CONFIG_HAVE_CLK routines) code using clk.h > > > > like this driver needs not depend on HAVE_CLK. > > > > > > > > Signed-off-by: Baruch Siach <baruch@xxxxxxxxxx> > > > > > > Acked-by: Simon Horman <horms+renesas@xxxxxxxxxxxx> > > > > Thanks. This patch conflicts with another sh_sci patch you have just posted > > (http://article.gmane.org/gmane.linux.serial/13640). How would you like this > > to be handled? > > Indeed it does, sorry for not noticing that. > > Perhaps it would be best to drop the patch that I posted? Why drop? There is no logical conflict between the patches, only textual. So we just need to serialize them to solve the conflict, and have them go via the same tree. baruch > > > > --- > > > > drivers/tty/serial/Kconfig | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig > > > > index a3815eaed421..ce6fd1dd0864 100644 > > > > --- a/drivers/tty/serial/Kconfig > > > > +++ b/drivers/tty/serial/Kconfig > > > > @@ -708,7 +708,7 @@ config SERIAL_IP22_ZILOG_CONSOLE > > > > > > > > config SERIAL_SH_SCI > > > > tristate "SuperH SCI(F) serial port support" > > > > - depends on HAVE_CLK && (SUPERH || ARM || COMPILE_TEST) > > > > + depends on SUPERH || ARM || COMPILE_TEST > > > > select SERIAL_CORE > > > > > > > > config SERIAL_SH_SCI_NR_UARTS > > > > -- > > > > 1.8.5.3 -- http://baruch.siach.name/blog/ ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch@xxxxxxxxxx - tel: +972.2.679.5364, http://www.tkos.co.il - -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
