Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tty: move hvc drivers to drivers/tty/hvc/

As requested by Arnd Bergmann, the hvc drivers are now
moved to the drivers/tty/hvc/ directory. The virtio_console.c driver
was also moved, as it required the hvc_console.h file to be able to be
built, and it really is a hvc driver.

Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+14 -13
-13
drivers/char/Makefile
··· 30 30 obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o 31 31 obj-$(CONFIG_SX) += sx.o generic_serial.o 32 32 obj-$(CONFIG_RIO) += rio/ generic_serial.o 33 - obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o 34 - obj-$(CONFIG_HVC_ISERIES) += hvc_iseries.o 35 - obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o 36 - obj-$(CONFIG_HVC_TILE) += hvc_tile.o 37 - obj-$(CONFIG_HVC_DCC) += hvc_dcc.o 38 - obj-$(CONFIG_HVC_BEAT) += hvc_beat.o 39 - obj-$(CONFIG_HVC_DRIVER) += hvc_console.o 40 - obj-$(CONFIG_HVC_IRQ) += hvc_irq.o 41 - obj-$(CONFIG_HVC_XEN) += hvc_xen.o 42 - obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o 43 - obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o 44 - obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o 45 33 obj-$(CONFIG_RAW_DRIVER) += raw.o 46 34 obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o 47 35 obj-$(CONFIG_MSPEC) += mspec.o 48 36 obj-$(CONFIG_MMTIMER) += mmtimer.o 49 37 obj-$(CONFIG_UV_MMTIMER) += uv_mmtimer.o 50 38 obj-$(CONFIG_VIOTAPE) += viotape.o 51 - obj-$(CONFIG_HVCS) += hvcs.o 52 39 obj-$(CONFIG_IBM_BSR) += bsr.o 53 40 obj-$(CONFIG_SGI_MBCS) += mbcs.o 54 41 obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o
drivers/char/hvc_beat.c drivers/tty/hvc/hvc_beat.c
drivers/char/hvc_console.c drivers/tty/hvc/hvc_console.c
drivers/char/hvc_console.h drivers/tty/hvc/hvc_console.h
drivers/char/hvc_dcc.c drivers/tty/hvc/hvc_dcc.c
drivers/char/hvc_irq.c drivers/tty/hvc/hvc_irq.c
drivers/char/hvc_iseries.c drivers/tty/hvc/hvc_iseries.c
drivers/char/hvc_iucv.c drivers/tty/hvc/hvc_iucv.c
drivers/char/hvc_rtas.c drivers/tty/hvc/hvc_rtas.c
drivers/char/hvc_tile.c drivers/tty/hvc/hvc_tile.c
drivers/char/hvc_udbg.c drivers/tty/hvc/hvc_udbg.c
drivers/char/hvc_vio.c drivers/tty/hvc/hvc_vio.c
drivers/char/hvc_xen.c drivers/tty/hvc/hvc_xen.c
drivers/char/hvcs.c drivers/tty/hvc/hvcs.c
drivers/char/hvsi.c drivers/tty/hvc/hvsi.c
drivers/char/virtio_console.c drivers/tty/hvc/virtio_console.c
+1
drivers/tty/Makefile
··· 9 9 obj-$(CONFIG_R3964) += n_r3964.o 10 10 11 11 obj-y += vt/ 12 + obj-$(CONFIG_HVC_DRIVER) += hvc/
+13
drivers/tty/hvc/Makefile
··· 1 + obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o 2 + obj-$(CONFIG_HVC_ISERIES) += hvc_iseries.o 3 + obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o 4 + obj-$(CONFIG_HVC_TILE) += hvc_tile.o 5 + obj-$(CONFIG_HVC_DCC) += hvc_dcc.o 6 + obj-$(CONFIG_HVC_BEAT) += hvc_beat.o 7 + obj-$(CONFIG_HVC_DRIVER) += hvc_console.o 8 + obj-$(CONFIG_HVC_IRQ) += hvc_irq.o 9 + obj-$(CONFIG_HVC_XEN) += hvc_xen.o 10 + obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o 11 + obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o 12 + obj-$(CONFIG_HVCS) += hvcs.o 13 + obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o