Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51df0acc authored by Amit Shah's avatar Amit Shah Committed by Greg Kroah-Hartman
Browse files

virtio: console: Move file back to drivers/char/ 



Commit 728674a7 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: default avatarAmit Shah <amit.shah@redhat.com>
CC: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ebf53826

drivers/char/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/tty/hvc/virtio_console.c→drivers/char/virtio_console.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <linux/virtio_console.h>

#include <linux/wait.h>

#include <linux/workqueue.h>

#include "hvc_console.h"

#include "../tty/hvc/hvc_console.h"



/*

 * This is a global struct for storing common data for all the devices

drivers/tty/hvc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -10,4 +10,3 @@ obj-$(CONFIG_HVC_XEN) += hvc_xen.o 
obj-$(CONFIG_HVC_IUCV)		+= hvc_iucv.o

obj-$(CONFIG_HVC_UDBG)		+= hvc_udbg.o

obj-$(CONFIG_HVCS)		+= hvcs.o
 
obj-$(CONFIG_VIRTIO_CONSOLE)	+= virtio_console.o