Hi Greg,
Today's linux-next merge of the tty tree got a conflict in
drivers/char/Makefile between commit
51df0acc3d76cf41d5496ef044cc5717ab5c7f71 ("virtio: console: Move file
back to drivers/char/") from Linus' tree and commit
a6afd9f3e819de4795fcd356e5bfad446e4323f2 ("tty: move a number of tty
drivers from drivers/char/ to drivers/tty/") (and later ones) from the tty
tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/char/Makefile
index 8238f89,3ca1f62..0000000
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@@ -5,32 -5,7 +5,8 @@@
obj-y += mem.o random.o
obj-$(CONFIG_TTY_PRINTK) += ttyprintk.o
obj-y += misc.o
- obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o
- obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
- obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
- obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
- obj-$(CONFIG_ROCKETPORT) += rocket.o
- obj-$(CONFIG_SERIAL167) += serial167.o
- obj-$(CONFIG_CYCLADES) += cyclades.o
- obj-$(CONFIG_STALLION) += stallion.o
- obj-$(CONFIG_ISTALLION) += istallion.o
- obj-$(CONFIG_NOZOMI) += nozomi.o
- obj-$(CONFIG_DIGIEPCA) += epca.o
- obj-$(CONFIG_SPECIALIX) += specialix.o
- obj-$(CONFIG_MOXA_INTELLIO) += moxa.o
- obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o
obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
- obj-$(CONFIG_MOXA_SMARTIO) += mxser.o
- obj-$(CONFIG_COMPUTONE) += ip2/
- obj-$(CONFIG_RISCOM8) += riscom8.o
- obj-$(CONFIG_ISI) += isicom.o
- obj-$(CONFIG_SYNCLINK) += synclink.o
- obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o
- obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o
- obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
- obj-$(CONFIG_SX) += sx.o generic_serial.o
- obj-$(CONFIG_RIO) += rio/ generic_serial.o
+obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o
obj-$(CONFIG_RAW_DRIVER) += raw.o
obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o
obj-$(CONFIG_MSPEC) += mspec.o
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
