summaryrefslogtreecommitdiffstats
path: root/drivers/char/Makefile
diff options
context:
space:
mode:
authorAmit Shah <amit.shah@redhat.com>2011-02-01 05:01:25 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-03 23:43:12 +0100
commit51df0acc3d76cf41d5496ef044cc5717ab5c7f71 (patch)
tree414f9c3934d96213b0c092ad91f2c81469d84520 /drivers/char/Makefile
parentLinux 2.6.38-rc3 (diff)
downloadlinux-51df0acc3d76cf41d5496ef044cc5717ab5c7f71.tar.xz
linux-51df0acc3d76cf41d5496ef044cc5717ab5c7f71.zip
virtio: console: Move file back to drivers/char/
Commit 728674a7e466628df2aeec6d11a2ae1ef968fb67 moved virtio_console.c to drivers/tty/hvc/ under the perception of this being an hvc driver. It was such once, but these days it has generic communication capabilities as well, so move it to drivers/char/. In the future, the hvc part from this file can be split off and moved under drivers/tty/hvc/. Signed-off-by: Amit Shah <amit.shah@redhat.com> CC: Rusty Russell <rusty@rustcorp.com.au> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char/Makefile')
-rw-r--r--drivers/char/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 5bc765d4c3ca..8238f89f73c9 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -30,6 +30,7 @@ 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