Merge branches 'release' and 'dmi' into release

[linux-2.6] / drivers / char / Makefile

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index c78ff26..96fc01e 100644 (file)
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -26,6 +26,7 @@ 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
@@ -42,7 +43,6 @@ obj-$(CONFIG_SYNCLINK_GT)     += synclink_gt.o
 obj-$(CONFIG_N_HDLC)           += n_hdlc.o
 obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
 obj-$(CONFIG_SX)               += sx.o generic_serial.o
-obj-$(CONFIG_LGUEST_GUEST)     += hvc_lguest.o
 obj-$(CONFIG_RIO)              += rio/ generic_serial.o
 obj-$(CONFIG_HVC_CONSOLE)      += hvc_vio.o hvsi.o
 obj-$(CONFIG_HVC_ISERIES)      += hvc_iseries.o
@@ -50,6 +50,7 @@ obj-$(CONFIG_HVC_RTAS)                += hvc_rtas.o
 obj-$(CONFIG_HVC_BEAT)         += hvc_beat.o
 obj-$(CONFIG_HVC_DRIVER)       += hvc_console.o
 obj-$(CONFIG_HVC_XEN)          += hvc_xen.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