From: Sascha Hauer Date: Fri, 11 Feb 2011 07:32:18 +0000 (+0100) Subject: Merge commit 'v2.6.38-rc4' into imx-for-2.6.39 X-Git-Tag: v2.6.39-rc1~434^2~5^2~91 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f19693a17c6705e197eb24d4618060eaac1b535c;p=thirdparty%2Fkernel%2Flinux.git Merge commit 'v2.6.38-rc4' into imx-for-2.6.39 Conflicts: arch/arm/mach-mxs/clock-mx28.c Signed-off-by: Sascha Hauer --- f19693a17c6705e197eb24d4618060eaac1b535c diff --cc arch/arm/mach-mxs/clock-mx28.c index c9d7951e8bfb3,fd1c4c54b8e51..febd787f054f7 --- a/arch/arm/mach-mxs/clock-mx28.c +++ b/arch/arm/mach-mxs/clock-mx28.c @@@ -609,12 -609,6 +609,11 @@@ static struct clk_lookup lookups[] = _REGISTER_CLOCK("duart", NULL, uart_clk) _REGISTER_CLOCK("imx28-fec.0", NULL, fec_clk) _REGISTER_CLOCK("imx28-fec.1", NULL, fec_clk) + _REGISTER_CLOCK("mxs-auart.0", NULL, uart_clk) + _REGISTER_CLOCK("mxs-auart.1", NULL, uart_clk) + _REGISTER_CLOCK("mxs-auart.2", NULL, uart_clk) + _REGISTER_CLOCK("mxs-auart.3", NULL, uart_clk) + _REGISTER_CLOCK("mxs-auart.4", NULL, uart_clk) - _REGISTER_CLOCK("fec.0", NULL, fec_clk) _REGISTER_CLOCK("rtc", NULL, rtc_clk) _REGISTER_CLOCK("pll2", NULL, pll2_clk) _REGISTER_CLOCK(NULL, "hclk", hbus_clk) diff --cc drivers/tty/serial/mxs-auart.c index 6d01ac9681032,0000000000000..6d01ac9681032 mode 100644,000000..100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c