diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-04 15:50:47 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-05 11:16:52 -0400 |
commit | 60d4ae8d436b8be6a8aedb63440203d5395e9f53 (patch) | |
tree | 2e0798d278100518634b999dc6705e9f02027d9f /drivers/char/Makefile | |
parent | 96fd7ce58ffb5c7bf376796b5525ba3ea1c9d69f (diff) |
TTY: create drivers/tty/vt and move the vt code there
The vt and other related code is moved into the drivers/tty/vt directory.
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/char/Makefile')
-rw-r--r-- | drivers/char/Makefile | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index f308494bfc90..ba53ec956c95 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile | |||
@@ -2,18 +2,10 @@ | |||
2 | # Makefile for the kernel character device drivers. | 2 | # Makefile for the kernel character device drivers. |
3 | # | 3 | # |
4 | 4 | ||
5 | # | ||
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 | 5 | obj-y += mem.o random.o |
11 | obj-$(CONFIG_TTY_PRINTK) += ttyprintk.o | 6 | obj-$(CONFIG_TTY_PRINTK) += ttyprintk.o |
12 | obj-y += misc.o | 7 | obj-y += misc.o |
13 | obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o selection.o keyboard.o | ||
14 | obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o | 8 | obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o |
15 | obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o | ||
16 | obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o | ||
17 | obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o | 9 | obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o |
18 | obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o | 10 | obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o |
19 | obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o | 11 | obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o |
@@ -106,28 +98,3 @@ obj-$(CONFIG_RAMOOPS) += ramoops.o | |||
106 | 98 | ||
107 | obj-$(CONFIG_JS_RTC) += js-rtc.o | 99 | obj-$(CONFIG_JS_RTC) += js-rtc.o |
108 | js-rtc-y = rtc.o | 100 | js-rtc-y = rtc.o |
109 | |||
110 | # Files generated that shall be removed upon make clean | ||
111 | clean-files := consolemap_deftbl.c defkeymap.c | ||
112 | |||
113 | quiet_cmd_conmk = CONMK $@ | ||
114 | cmd_conmk = scripts/conmakehash $< > $@ | ||
115 | |||
116 | $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) | ||
117 | $(call cmd,conmk) | ||
118 | |||
119 | $(obj)/defkeymap.o: $(obj)/defkeymap.c | ||
120 | |||
121 | # Uncomment if you're changing the keymap and have an appropriate | ||
122 | # loadkeys version for the map. By default, we'll use the shipped | ||
123 | # versions. | ||
124 | # GENERATE_KEYMAP := 1 | ||
125 | |||
126 | ifdef GENERATE_KEYMAP | ||
127 | |||
128 | $(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map | ||
129 | loadkeys --mktable $< > $@.tmp | ||
130 | sed -e 's/^static *//' $@.tmp > $@ | ||
131 | rm $@.tmp | ||
132 | |||
133 | endif | ||