diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-04 11:10:29 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-05 08:10:33 -0700 |
commit | 96fd7ce58ffb5c7bf376796b5525ba3ea1c9d69f (patch) | |
tree | aca24a6c1c0e506d5fa7b0266c4c1866786607ae /drivers | |
parent | c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (diff) | |
download | kernel_samsung_smdk4412-96fd7ce58ffb5c7bf376796b5525ba3ea1c9d69f.zip kernel_samsung_smdk4412-96fd7ce58ffb5c7bf376796b5525ba3ea1c9d69f.tar.gz kernel_samsung_smdk4412-96fd7ce58ffb5c7bf376796b5525ba3ea1c9d69f.tar.bz2 |
TTY: create drivers/tty and move the tty core files there
The tty code should be in its own subdirectory and not in the char
driver with all of the cruft that is currently there.
Based on work done by Arnd Bergmann <arnd@arndb.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/Makefile | 1 | ||||
-rw-r--r-- | drivers/char/Makefile | 11 | ||||
-rw-r--r-- | drivers/tty/Makefile | 9 | ||||
-rw-r--r-- | drivers/tty/n_gsm.c (renamed from drivers/char/n_gsm.c) | 0 | ||||
-rw-r--r-- | drivers/tty/n_hdlc.c (renamed from drivers/char/n_hdlc.c) | 0 | ||||
-rw-r--r-- | drivers/tty/n_r3964.c (renamed from drivers/char/n_r3964.c) | 0 | ||||
-rw-r--r-- | drivers/tty/n_tty.c (renamed from drivers/char/n_tty.c) | 0 | ||||
-rw-r--r-- | drivers/tty/pty.c (renamed from drivers/char/pty.c) | 0 | ||||
-rw-r--r-- | drivers/tty/sysrq.c (renamed from drivers/char/sysrq.c) | 0 | ||||
-rw-r--r-- | drivers/tty/tty_audit.c (renamed from drivers/char/tty_audit.c) | 0 | ||||
-rw-r--r-- | drivers/tty/tty_buffer.c (renamed from drivers/char/tty_buffer.c) | 0 | ||||
-rw-r--r-- | drivers/tty/tty_io.c (renamed from drivers/char/tty_io.c) | 0 | ||||
-rw-r--r-- | drivers/tty/tty_ioctl.c (renamed from drivers/char/tty_ioctl.c) | 0 | ||||
-rw-r--r-- | drivers/tty/tty_ldisc.c (renamed from drivers/char/tty_ldisc.c) | 0 | ||||
-rw-r--r-- | drivers/tty/tty_mutex.c (renamed from drivers/char/tty_mutex.c) | 0 | ||||
-rw-r--r-- | drivers/tty/tty_port.c (renamed from drivers/char/tty_port.c) | 0 |
16 files changed, 11 insertions, 10 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 14cf907..f3ebb30 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -26,6 +26,7 @@ obj-$(CONFIG_REGULATOR) += regulator/ # char/ comes before serial/ etc so that the VT console is the boot-time # default. +obj-y += tty/ obj-y += char/ # gpu/ comes after char for AGP vs DRM startup diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 3a9c014..f308494 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -7,19 +7,13 @@ # FONTMAPFILE = cp437.uni -obj-y += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o tty_buffer.o tty_port.o - -obj-y += tty_mutex.o -obj-$(CONFIG_LEGACY_PTYS) += pty.o -obj-$(CONFIG_UNIX98_PTYS) += pty.o +obj-y += mem.o random.o obj-$(CONFIG_TTY_PRINTK) += ttyprintk.o obj-y += misc.o obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o selection.o keyboard.o obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o -obj-$(CONFIG_AUDIT) += tty_audit.o -obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o @@ -41,8 +35,6 @@ obj-$(CONFIG_ISI) += isicom.o obj-$(CONFIG_SYNCLINK) += synclink.o obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o -obj-$(CONFIG_N_HDLC) += n_hdlc.o -obj-$(CONFIG_N_GSM) += n_gsm.o obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o obj-$(CONFIG_SX) += sx.o generic_serial.o obj-$(CONFIG_RIO) += rio/ generic_serial.o @@ -74,7 +66,6 @@ obj-$(CONFIG_PRINTER) += lp.o obj-$(CONFIG_APM_EMULATION) += apm-emulation.o obj-$(CONFIG_DTLK) += dtlk.o -obj-$(CONFIG_R3964) += n_r3964.o obj-$(CONFIG_APPLICOM) += applicom.o obj-$(CONFIG_SONYPI) += sonypi.o obj-$(CONFIG_RTC) += rtc.o diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile new file mode 100644 index 0000000..7f63b33 --- /dev/null +++ b/drivers/tty/Makefile @@ -0,0 +1,9 @@ +obj-y += tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o \ + tty_buffer.o tty_port.o tty_mutex.o +obj-$(CONFIG_LEGACY_PTYS) += pty.o +obj-$(CONFIG_UNIX98_PTYS) += pty.o +obj-$(CONFIG_AUDIT) += tty_audit.o +obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o +obj-$(CONFIG_N_HDLC) += n_hdlc.o +obj-$(CONFIG_N_GSM) += n_gsm.o +obj-$(CONFIG_R3964) += n_r3964.o diff --git a/drivers/char/n_gsm.c b/drivers/tty/n_gsm.c index 04ef3ef..04ef3ef 100644 --- a/drivers/char/n_gsm.c +++ b/drivers/tty/n_gsm.c diff --git a/drivers/char/n_hdlc.c b/drivers/tty/n_hdlc.c index 47d3228..47d3228 100644 --- a/drivers/char/n_hdlc.c +++ b/drivers/tty/n_hdlc.c diff --git a/drivers/char/n_r3964.c b/drivers/tty/n_r3964.c index 88dda0c..88dda0c 100644 --- a/drivers/char/n_r3964.c +++ b/drivers/tty/n_r3964.c diff --git a/drivers/char/n_tty.c b/drivers/tty/n_tty.c index 428f4fe..428f4fe 100644 --- a/drivers/char/n_tty.c +++ b/drivers/tty/n_tty.c diff --git a/drivers/char/pty.c b/drivers/tty/pty.c index 923a485..923a485 100644 --- a/drivers/char/pty.c +++ b/drivers/tty/pty.c diff --git a/drivers/char/sysrq.c b/drivers/tty/sysrq.c index eaa5d3e..eaa5d3e 100644 --- a/drivers/char/sysrq.c +++ b/drivers/tty/sysrq.c diff --git a/drivers/char/tty_audit.c b/drivers/tty/tty_audit.c index f64582b..f64582b 100644 --- a/drivers/char/tty_audit.c +++ b/drivers/tty/tty_audit.c diff --git a/drivers/char/tty_buffer.c b/drivers/tty/tty_buffer.c index cc1e985..cc1e985 100644 --- a/drivers/char/tty_buffer.c +++ b/drivers/tty/tty_buffer.c diff --git a/drivers/char/tty_io.c b/drivers/tty/tty_io.c index c05c5af..c05c5af 100644 --- a/drivers/char/tty_io.c +++ b/drivers/tty/tty_io.c diff --git a/drivers/char/tty_ioctl.c b/drivers/tty/tty_ioctl.c index 0c18899..0c18899 100644 --- a/drivers/char/tty_ioctl.c +++ b/drivers/tty/tty_ioctl.c diff --git a/drivers/char/tty_ldisc.c b/drivers/tty/tty_ldisc.c index 412f977..412f977 100644 --- a/drivers/char/tty_ldisc.c +++ b/drivers/tty/tty_ldisc.c diff --git a/drivers/char/tty_mutex.c b/drivers/tty/tty_mutex.c index 1336975..1336975 100644 --- a/drivers/char/tty_mutex.c +++ b/drivers/tty/tty_mutex.c diff --git a/drivers/char/tty_port.c b/drivers/tty/tty_port.c index 33d37d2..33d37d2 100644 --- a/drivers/char/tty_port.c +++ b/drivers/tty/tty_port.c |