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>
mariux64 · Jan 13, 2011 · 728674a · 728674a
1 parent e691d24
commit 728674a
Show file tree

Hide file tree

Showing 18 changed files with 14 additions and 13 deletions.
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
@@ -30,25 +30,12 @@ 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_HVC_CONSOLE)	+= hvc_vio.o hvsi.o
-obj-$(CONFIG_HVC_ISERIES)	+= hvc_iseries.o
-obj-$(CONFIG_HVC_RTAS)		+= hvc_rtas.o
-obj-$(CONFIG_HVC_TILE)		+= hvc_tile.o
-obj-$(CONFIG_HVC_DCC)		+= hvc_dcc.o
-obj-$(CONFIG_HVC_BEAT)		+= hvc_beat.o
-obj-$(CONFIG_HVC_DRIVER)	+= hvc_console.o
-obj-$(CONFIG_HVC_IRQ)		+= hvc_irq.o
-obj-$(CONFIG_HVC_XEN)		+= hvc_xen.o
-obj-$(CONFIG_HVC_IUCV)		+= hvc_iucv.o
-obj-$(CONFIG_HVC_UDBG)		+= hvc_udbg.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
 obj-$(CONFIG_MMTIMER)		+= mmtimer.o
 obj-$(CONFIG_UV_MMTIMER)	+= uv_mmtimer.o
 obj-$(CONFIG_VIOTAPE)		+= viotape.o
-obj-$(CONFIG_HVCS)		+= hvcs.o
 obj-$(CONFIG_IBM_BSR)		+= bsr.o
 obj-$(CONFIG_SGI_MBCS)		+= mbcs.o
 obj-$(CONFIG_BRIQ_PANEL)	+= briq_panel.o

diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
@@ -9,3 +9,4 @@ obj-$(CONFIG_N_GSM)		+= n_gsm.o
 obj-$(CONFIG_R3964)		+= n_r3964.o
 
 obj-y				+= vt/
+obj-$(CONFIG_HVC_DRIVER)	+= hvc/
diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile
@@ -0,0 +1,13 @@
+obj-$(CONFIG_HVC_CONSOLE)	+= hvc_vio.o hvsi.o
+obj-$(CONFIG_HVC_ISERIES)	+= hvc_iseries.o
+obj-$(CONFIG_HVC_RTAS)		+= hvc_rtas.o
+obj-$(CONFIG_HVC_TILE)		+= hvc_tile.o
+obj-$(CONFIG_HVC_DCC)		+= hvc_dcc.o
+obj-$(CONFIG_HVC_BEAT)		+= hvc_beat.o
+obj-$(CONFIG_HVC_DRIVER)	+= hvc_console.o
+obj-$(CONFIG_HVC_IRQ)		+= hvc_irq.o
+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
diff --git a/drivers/char/hvc_beat.c → drivers/tty/hvc/hvc_beat.c b/drivers/char/hvc_beat.c → drivers/tty/hvc/hvc_beat.c
diff --git a/drivers/char/hvc_console.c → drivers/tty/hvc/hvc_console.c b/drivers/char/hvc_console.c → drivers/tty/hvc/hvc_console.c
diff --git a/drivers/char/hvc_console.h → drivers/tty/hvc/hvc_console.h b/drivers/char/hvc_console.h → drivers/tty/hvc/hvc_console.h
diff --git a/drivers/char/hvc_dcc.c → drivers/tty/hvc/hvc_dcc.c b/drivers/char/hvc_dcc.c → drivers/tty/hvc/hvc_dcc.c
diff --git a/drivers/char/hvc_irq.c → drivers/tty/hvc/hvc_irq.c b/drivers/char/hvc_irq.c → drivers/tty/hvc/hvc_irq.c
diff --git a/drivers/char/hvc_iseries.c → drivers/tty/hvc/hvc_iseries.c b/drivers/char/hvc_iseries.c → drivers/tty/hvc/hvc_iseries.c
diff --git a/drivers/char/hvc_iucv.c → drivers/tty/hvc/hvc_iucv.c b/drivers/char/hvc_iucv.c → drivers/tty/hvc/hvc_iucv.c
diff --git a/drivers/char/hvc_rtas.c → drivers/tty/hvc/hvc_rtas.c b/drivers/char/hvc_rtas.c → drivers/tty/hvc/hvc_rtas.c
diff --git a/drivers/char/hvc_tile.c → drivers/tty/hvc/hvc_tile.c b/drivers/char/hvc_tile.c → drivers/tty/hvc/hvc_tile.c
diff --git a/drivers/char/hvc_udbg.c → drivers/tty/hvc/hvc_udbg.c b/drivers/char/hvc_udbg.c → drivers/tty/hvc/hvc_udbg.c
diff --git a/drivers/char/hvc_vio.c → drivers/tty/hvc/hvc_vio.c b/drivers/char/hvc_vio.c → drivers/tty/hvc/hvc_vio.c
diff --git a/drivers/char/hvc_xen.c → drivers/tty/hvc/hvc_xen.c b/drivers/char/hvc_xen.c → drivers/tty/hvc/hvc_xen.c
diff --git a/drivers/char/hvcs.c → drivers/tty/hvc/hvcs.c b/drivers/char/hvcs.c → drivers/tty/hvc/hvcs.c
diff --git a/drivers/char/hvsi.c → drivers/tty/hvc/hvsi.c b/drivers/char/hvsi.c → drivers/tty/hvc/hvsi.c
diff --git a/drivers/char/virtio_console.c → drivers/tty/hvc/virtio_console.c b/drivers/char/virtio_console.c → drivers/tty/hvc/virtio_console.c