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

# 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

# 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

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

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

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

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/