summaryrefslogtreecommitdiff
path: root/drivers/char/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 12:02:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 12:02:08 -0700
commitff5d48a6d18d09bb750d1f89f6464f5fdb6fc85b (patch)
tree243a2157912d6183c99d98dc74fe7a87a5cfbf6e /drivers/char/Makefile
parent762b8291be6944bd891fbe2c8976a2b2e5bbc726 (diff)
parenta29ccf6f823a84d89e1c7aaaf221cf7282022024 (diff)
Merge git://git.infradead.org/embedded-2.6
* git://git.infradead.org/embedded-2.6: Make console charset translation optional
Diffstat (limited to 'drivers/char/Makefile')
-rw-r--r--drivers/char/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index f7a0d1a754fc..8a161c30e1dc 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -12,8 +12,8 @@ obj-y += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o
obj-$(CONFIG_LEGACY_PTYS) += pty.o
obj-$(CONFIG_UNIX98_PTYS) += pty.o
obj-y += misc.o
-obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o consolemap.o \
- consolemap_deftbl.o selection.o keyboard.o
+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
obj-$(CONFIG_AUDIT) += tty_audit.o
obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o