diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-08 13:55:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-08 13:55:29 -0500 |
commit | 5398a64c63a69a0ac33dbae458ea4aab0dc23f14 (patch) | |
tree | ae3c668c3247df18db0a293cbcfad4a9e53d0fd7 /drivers | |
parent | 764e028e24d33f6e375d2a5df450c9d0180fbc00 (diff) | |
parent | 1db01135df7aa8b456e093a781f1d7f7016ec01e (diff) |
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
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/Makefile | 1 | ||||
-rw-r--r-- | drivers/char/Makefile | 44 | ||||
-rw-r--r-- | drivers/tty/Makefile | 11 | ||||
-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 | ||||
-rw-r--r-- | drivers/tty/vt/.gitignore (renamed from drivers/char/.gitignore) | 0 | ||||
-rw-r--r-- | drivers/tty/vt/Makefile | 34 | ||||
-rw-r--r-- | drivers/tty/vt/consolemap.c (renamed from drivers/char/consolemap.c) | 0 | ||||
-rw-r--r-- | drivers/tty/vt/cp437.uni (renamed from drivers/char/cp437.uni) | 0 | ||||
-rw-r--r-- | drivers/tty/vt/defkeymap.c_shipped (renamed from drivers/char/defkeymap.c_shipped) | 0 | ||||
-rw-r--r-- | drivers/tty/vt/defkeymap.map (renamed from drivers/char/defkeymap.map) | 0 | ||||
-rw-r--r-- | drivers/tty/vt/keyboard.c (renamed from drivers/char/keyboard.c) | 0 | ||||
-rw-r--r-- | drivers/tty/vt/selection.c (renamed from drivers/char/selection.c) | 0 | ||||
-rw-r--r-- | drivers/tty/vt/vc_screen.c (renamed from drivers/char/vc_screen.c) | 0 | ||||
-rw-r--r-- | drivers/tty/vt/vt.c (renamed from drivers/char/vt.c) | 0 | ||||
-rw-r--r-- | drivers/tty/vt/vt_ioctl.c (renamed from drivers/char/vt_ioctl.c) | 0 |
27 files changed, 47 insertions, 43 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 14cf9077bb2b..f3ebb30f1b7f 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
@@ -26,6 +26,7 @@ obj-$(CONFIG_REGULATOR) += regulator/ | |||
26 | 26 | ||
27 | # char/ comes before serial/ etc so that the VT console is the boot-time | 27 | # char/ comes before serial/ etc so that the VT console is the boot-time |
28 | # default. | 28 | # default. |
29 | obj-y += tty/ | ||
29 | obj-y += char/ | 30 | obj-y += char/ |
30 | 31 | ||
31 | # gpu/ comes after char for AGP vs DRM startup | 32 | # gpu/ comes after char for AGP vs DRM startup |
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 3a9c01416839..ba53ec956c95 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile | |||
@@ -2,24 +2,10 @@ | |||
2 | # Makefile for the kernel character device drivers. | 2 | # Makefile for the kernel character device drivers. |
3 | # | 3 | # |
4 | 4 | ||
5 | # | 5 | obj-y += mem.o random.o |
6 | # This file contains the font map for the default (hardware) font | ||
7 | # | ||
8 | FONTMAPFILE = cp437.uni | ||
9 | |||
10 | obj-y += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o tty_buffer.o tty_port.o | ||
11 | |||
12 | obj-y += tty_mutex.o | ||
13 | obj-$(CONFIG_LEGACY_PTYS) += pty.o | ||
14 | obj-$(CONFIG_UNIX98_PTYS) += pty.o | ||
15 | obj-$(CONFIG_TTY_PRINTK) += ttyprintk.o | 6 | obj-$(CONFIG_TTY_PRINTK) += ttyprintk.o |
16 | obj-y += misc.o | 7 | obj-y += misc.o |
17 | obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o selection.o keyboard.o | ||
18 | obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o | 8 | obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o |
19 | obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o | ||
20 | obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o | ||
21 | obj-$(CONFIG_AUDIT) += tty_audit.o | ||
22 | obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o | ||
23 | obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o | 9 | obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o |
24 | obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o | 10 | obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o |
25 | obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o | 11 | obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o |
@@ -41,8 +27,6 @@ obj-$(CONFIG_ISI) += isicom.o | |||
41 | obj-$(CONFIG_SYNCLINK) += synclink.o | 27 | obj-$(CONFIG_SYNCLINK) += synclink.o |
42 | obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o | 28 | obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o |
43 | obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o | 29 | obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o |
44 | obj-$(CONFIG_N_HDLC) += n_hdlc.o | ||
45 | obj-$(CONFIG_N_GSM) += n_gsm.o | ||
46 | obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o | 30 | obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o |
47 | obj-$(CONFIG_SX) += sx.o generic_serial.o | 31 | obj-$(CONFIG_SX) += sx.o generic_serial.o |
48 | obj-$(CONFIG_RIO) += rio/ generic_serial.o | 32 | obj-$(CONFIG_RIO) += rio/ generic_serial.o |
@@ -74,7 +58,6 @@ obj-$(CONFIG_PRINTER) += lp.o | |||
74 | obj-$(CONFIG_APM_EMULATION) += apm-emulation.o | 58 | obj-$(CONFIG_APM_EMULATION) += apm-emulation.o |
75 | 59 | ||
76 | obj-$(CONFIG_DTLK) += dtlk.o | 60 | obj-$(CONFIG_DTLK) += dtlk.o |
77 | obj-$(CONFIG_R3964) += n_r3964.o | ||
78 | obj-$(CONFIG_APPLICOM) += applicom.o | 61 | obj-$(CONFIG_APPLICOM) += applicom.o |
79 | obj-$(CONFIG_SONYPI) += sonypi.o | 62 | obj-$(CONFIG_SONYPI) += sonypi.o |
80 | obj-$(CONFIG_RTC) += rtc.o | 63 | obj-$(CONFIG_RTC) += rtc.o |
@@ -115,28 +98,3 @@ obj-$(CONFIG_RAMOOPS) += ramoops.o | |||
115 | 98 | ||
116 | obj-$(CONFIG_JS_RTC) += js-rtc.o | 99 | obj-$(CONFIG_JS_RTC) += js-rtc.o |
117 | js-rtc-y = rtc.o | 100 | js-rtc-y = rtc.o |
118 | |||
119 | # Files generated that shall be removed upon make clean | ||
120 | clean-files := consolemap_deftbl.c defkeymap.c | ||
121 | |||
122 | quiet_cmd_conmk = CONMK $@ | ||
123 | cmd_conmk = scripts/conmakehash $< > $@ | ||
124 | |||
125 | $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) | ||
126 | $(call cmd,conmk) | ||
127 | |||
128 | $(obj)/defkeymap.o: $(obj)/defkeymap.c | ||
129 | |||
130 | # Uncomment if you're changing the keymap and have an appropriate | ||
131 | # loadkeys version for the map. By default, we'll use the shipped | ||
132 | # versions. | ||
133 | # GENERATE_KEYMAP := 1 | ||
134 | |||
135 | ifdef GENERATE_KEYMAP | ||
136 | |||
137 | $(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map | ||
138 | loadkeys --mktable $< > $@.tmp | ||
139 | sed -e 's/^static *//' $@.tmp > $@ | ||
140 | rm $@.tmp | ||
141 | |||
142 | endif | ||
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile new file mode 100644 index 000000000000..c43ef48b1a0f --- /dev/null +++ b/drivers/tty/Makefile | |||
@@ -0,0 +1,11 @@ | |||
1 | obj-y += tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o \ | ||
2 | tty_buffer.o tty_port.o tty_mutex.o | ||
3 | obj-$(CONFIG_LEGACY_PTYS) += pty.o | ||
4 | obj-$(CONFIG_UNIX98_PTYS) += pty.o | ||
5 | obj-$(CONFIG_AUDIT) += tty_audit.o | ||
6 | obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o | ||
7 | obj-$(CONFIG_N_HDLC) += n_hdlc.o | ||
8 | obj-$(CONFIG_N_GSM) += n_gsm.o | ||
9 | obj-$(CONFIG_R3964) += n_r3964.o | ||
10 | |||
11 | obj-y += vt/ | ||
diff --git a/drivers/char/n_gsm.c b/drivers/tty/n_gsm.c index 04ef3ef0a422..04ef3ef0a422 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 47d32281032c..47d32281032c 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 88dda0c45ee0..88dda0c45ee0 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 428f4fe0b5f7..428f4fe0b5f7 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 923a48585501..923a48585501 100644 --- a/drivers/char/pty.c +++ b/drivers/tty/pty.c | |||
diff --git a/drivers/char/sysrq.c b/drivers/tty/sysrq.c index eaa5d3efa79d..eaa5d3efa79d 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 f64582b0f623..f64582b0f623 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 cc1e9850d655..cc1e9850d655 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 c05c5af5aa04..c05c5af5aa04 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 0c1889971459..0c1889971459 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 412f9775d19c..412f9775d19c 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 133697540c73..133697540c73 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 33d37d230f8f..33d37d230f8f 100644 --- a/drivers/char/tty_port.c +++ b/drivers/tty/tty_port.c | |||
diff --git a/drivers/char/.gitignore b/drivers/tty/vt/.gitignore index 83683a2d8e6a..83683a2d8e6a 100644 --- a/drivers/char/.gitignore +++ b/drivers/tty/vt/.gitignore | |||
diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile new file mode 100644 index 000000000000..14a51c9960df --- /dev/null +++ b/drivers/tty/vt/Makefile | |||
@@ -0,0 +1,34 @@ | |||
1 | # | ||
2 | # This file contains the font map for the default (hardware) font | ||
3 | # | ||
4 | FONTMAPFILE = cp437.uni | ||
5 | |||
6 | obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o \ | ||
7 | selection.o keyboard.o | ||
8 | obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o | ||
9 | obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o | ||
10 | |||
11 | # Files generated that shall be removed upon make clean | ||
12 | clean-files := consolemap_deftbl.c defkeymap.c | ||
13 | |||
14 | quiet_cmd_conmk = CONMK $@ | ||
15 | cmd_conmk = scripts/conmakehash $< > $@ | ||
16 | |||
17 | $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) | ||
18 | $(call cmd,conmk) | ||
19 | |||
20 | $(obj)/defkeymap.o: $(obj)/defkeymap.c | ||
21 | |||
22 | # Uncomment if you're changing the keymap and have an appropriate | ||
23 | # loadkeys version for the map. By default, we'll use the shipped | ||
24 | # versions. | ||
25 | # GENERATE_KEYMAP := 1 | ||
26 | |||
27 | ifdef GENERATE_KEYMAP | ||
28 | |||
29 | $(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map | ||
30 | loadkeys --mktable $< > $@.tmp | ||
31 | sed -e 's/^static *//' $@.tmp > $@ | ||
32 | rm $@.tmp | ||
33 | |||
34 | endif | ||
diff --git a/drivers/char/consolemap.c b/drivers/tty/vt/consolemap.c index 45d3e80156d4..45d3e80156d4 100644 --- a/drivers/char/consolemap.c +++ b/drivers/tty/vt/consolemap.c | |||
diff --git a/drivers/char/cp437.uni b/drivers/tty/vt/cp437.uni index bc6163484f62..bc6163484f62 100644 --- a/drivers/char/cp437.uni +++ b/drivers/tty/vt/cp437.uni | |||
diff --git a/drivers/char/defkeymap.c_shipped b/drivers/tty/vt/defkeymap.c_shipped index d2208dfe3f67..d2208dfe3f67 100644 --- a/drivers/char/defkeymap.c_shipped +++ b/drivers/tty/vt/defkeymap.c_shipped | |||
diff --git a/drivers/char/defkeymap.map b/drivers/tty/vt/defkeymap.map index 50b30cace261..50b30cace261 100644 --- a/drivers/char/defkeymap.map +++ b/drivers/tty/vt/defkeymap.map | |||
diff --git a/drivers/char/keyboard.c b/drivers/tty/vt/keyboard.c index e95d7876ca6b..e95d7876ca6b 100644 --- a/drivers/char/keyboard.c +++ b/drivers/tty/vt/keyboard.c | |||
diff --git a/drivers/char/selection.c b/drivers/tty/vt/selection.c index ebae344ce910..ebae344ce910 100644 --- a/drivers/char/selection.c +++ b/drivers/tty/vt/selection.c | |||
diff --git a/drivers/char/vc_screen.c b/drivers/tty/vt/vc_screen.c index 273ab44cc91d..273ab44cc91d 100644 --- a/drivers/char/vc_screen.c +++ b/drivers/tty/vt/vc_screen.c | |||
diff --git a/drivers/char/vt.c b/drivers/tty/vt/vt.c index a8ec48ed14d9..a8ec48ed14d9 100644 --- a/drivers/char/vt.c +++ b/drivers/tty/vt/vt.c | |||
diff --git a/drivers/char/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c index 6b68a0fb4611..6b68a0fb4611 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/tty/vt/vt_ioctl.c | |||