Hi Greg,
Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/Makefile between commit 58235d376b15 ("SERIAL: AR933X:
Add driver for the built-in UART of the SoC") from the mips tree and
commit 161e773cbd0c ("UART: add CSR SiRFprimaII SoC on-chip uart
drivers") from the tty tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/tty/serial/Makefile
index 62f7d28,af57089..0000000
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@@ -89,4 -94,4 +89,5 @@@ obj-$(CONFIG_SERIAL_MSM_SMD) += msm_smd
obj-$(CONFIG_SERIAL_MXS_AUART) += mxs-auart.o
obj-$(CONFIG_SERIAL_LANTIQ) += lantiq.o
obj-$(CONFIG_SERIAL_XILINX_PS_UART) += xilinx_uartps.o
+obj-$(CONFIG_SERIAL_AR933X) += ar933x_uart.o
+ obj-$(CONFIG_SERIAL_SIRFSOC) += sirfsoc_uart.o
Attachment:
pgpusc1hkBgYq.pgp
Description: PGP signature
