Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: TTY: move .gitignore from drivers/char/ to drivers/tty/vt/ TTY: create drivers/tty/vt and move the vt code there TTY: create drivers/tty and move the tty core files there
jimmycarry · Nov 8, 2010 · 5398a64 · 5398a64
2 parents 764e028 + 1db0113
commit 5398a64
Show file tree

Hide file tree

Showing 27 changed files with 47 additions and 43 deletions.
diff --git 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
@@ -2,24 +2,10 @@
 # Makefile for the kernel character device drivers.
 #
 
-#
-# This file contains the font map for the default (hardware) font
-#
-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 +27,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 +58,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
@@ -115,28 +98,3 @@ obj-$(CONFIG_RAMOOPS)		+= ramoops.o
 
 obj-$(CONFIG_JS_RTC)		+= js-rtc.o
 js-rtc-y = rtc.o
-
-# Files generated that shall be removed upon make clean
-clean-files := consolemap_deftbl.c defkeymap.c
-
-quiet_cmd_conmk = CONMK   $@
-      cmd_conmk = scripts/conmakehash $< > $@
-
-$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
-	$(call cmd,conmk)
-
-$(obj)/defkeymap.o:  $(obj)/defkeymap.c
-
-# Uncomment if you're changing the keymap and have an appropriate
-# loadkeys version for the map. By default, we'll use the shipped
-# versions.
-# GENERATE_KEYMAP := 1
-
-ifdef GENERATE_KEYMAP
-
-$(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map
-	loadkeys --mktable $< > $@.tmp
-	sed -e 's/^static *//' $@.tmp > $@
-	rm $@.tmp
-
-endif
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
@@ -0,0 +1,11 @@
+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
+
+obj-y				+= vt/
diff --git a/drivers/char/n_gsm.c → drivers/tty/n_gsm.c b/drivers/char/n_gsm.c → drivers/tty/n_gsm.c
diff --git a/drivers/char/n_hdlc.c → drivers/tty/n_hdlc.c b/drivers/char/n_hdlc.c → drivers/tty/n_hdlc.c
diff --git a/drivers/char/n_r3964.c → drivers/tty/n_r3964.c b/drivers/char/n_r3964.c → drivers/tty/n_r3964.c
diff --git a/drivers/char/n_tty.c → drivers/tty/n_tty.c b/drivers/char/n_tty.c → drivers/tty/n_tty.c
diff --git a/drivers/char/pty.c → drivers/tty/pty.c b/drivers/char/pty.c → drivers/tty/pty.c
diff --git a/drivers/char/sysrq.c → drivers/tty/sysrq.c b/drivers/char/sysrq.c → drivers/tty/sysrq.c
diff --git a/drivers/char/tty_audit.c → drivers/tty/tty_audit.c b/drivers/char/tty_audit.c → drivers/tty/tty_audit.c
diff --git a/drivers/char/tty_buffer.c → drivers/tty/tty_buffer.c b/drivers/char/tty_buffer.c → drivers/tty/tty_buffer.c
diff --git a/drivers/char/tty_io.c → drivers/tty/tty_io.c b/drivers/char/tty_io.c → drivers/tty/tty_io.c
diff --git a/drivers/char/tty_ioctl.c → drivers/tty/tty_ioctl.c b/drivers/char/tty_ioctl.c → drivers/tty/tty_ioctl.c
diff --git a/drivers/char/tty_ldisc.c → drivers/tty/tty_ldisc.c b/drivers/char/tty_ldisc.c → drivers/tty/tty_ldisc.c
diff --git a/drivers/char/tty_mutex.c → drivers/tty/tty_mutex.c b/drivers/char/tty_mutex.c → drivers/tty/tty_mutex.c
diff --git a/drivers/char/tty_port.c → drivers/tty/tty_port.c b/drivers/char/tty_port.c → drivers/tty/tty_port.c
diff --git a/drivers/char/.gitignore → drivers/tty/vt/.gitignore b/drivers/char/.gitignore → drivers/tty/vt/.gitignore
diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
@@ -0,0 +1,34 @@
+#
+# This file contains the font map for the default (hardware) font
+#
+FONTMAPFILE = cp437.uni
+
+obj-$(CONFIG_VT)			+= vt_ioctl.o vc_screen.o \
+					   selection.o keyboard.o
+obj-$(CONFIG_CONSOLE_TRANSLATIONS)	+= consolemap.o consolemap_deftbl.o
+obj-$(CONFIG_HW_CONSOLE)		+= vt.o defkeymap.o
+
+# Files generated that shall be removed upon make clean
+clean-files := consolemap_deftbl.c defkeymap.c
+
+quiet_cmd_conmk = CONMK   $@
+      cmd_conmk = scripts/conmakehash $< > $@
+
+$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
+	$(call cmd,conmk)
+
+$(obj)/defkeymap.o:  $(obj)/defkeymap.c
+
+# Uncomment if you're changing the keymap and have an appropriate
+# loadkeys version for the map. By default, we'll use the shipped
+# versions.
+# GENERATE_KEYMAP := 1
+
+ifdef GENERATE_KEYMAP
+
+$(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map
+	loadkeys --mktable $< > $@.tmp
+	sed -e 's/^static *//' $@.tmp > $@
+	rm $@.tmp
+
+endif
diff --git a/drivers/char/consolemap.c → drivers/tty/vt/consolemap.c b/drivers/char/consolemap.c → drivers/tty/vt/consolemap.c
diff --git a/drivers/char/cp437.uni → drivers/tty/vt/cp437.uni b/drivers/char/cp437.uni → drivers/tty/vt/cp437.uni
diff --git a/drivers/char/defkeymap.c_shipped → drivers/tty/vt/defkeymap.c_shipped b/drivers/char/defkeymap.c_shipped → drivers/tty/vt/defkeymap.c_shipped
diff --git a/drivers/char/defkeymap.map → drivers/tty/vt/defkeymap.map b/drivers/char/defkeymap.map → drivers/tty/vt/defkeymap.map
diff --git a/drivers/char/keyboard.c → drivers/tty/vt/keyboard.c b/drivers/char/keyboard.c → drivers/tty/vt/keyboard.c
diff --git a/drivers/char/selection.c → drivers/tty/vt/selection.c b/drivers/char/selection.c → drivers/tty/vt/selection.c
diff --git a/drivers/char/vc_screen.c → drivers/tty/vt/vc_screen.c b/drivers/char/vc_screen.c → drivers/tty/vt/vc_screen.c
diff --git a/drivers/char/vt.c → drivers/tty/vt/vt.c b/drivers/char/vt.c → drivers/tty/vt/vt.c
diff --git a/drivers/char/vt_ioctl.c → drivers/tty/vt/vt_ioctl.c b/drivers/char/vt_ioctl.c → drivers/tty/vt/vt_ioctl.c