diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 08:57:47 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 08:57:47 -0700 |
commit | 49c355617f603b8e71ec117c1f940152a998528a (patch) | |
tree | 6b5e373003371bbe8c587a9fdda7bc4f0e791b03 /drivers/char/Makefile | |
parent | 991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d (diff) | |
parent | f0e8527726b9e56649b9eafde3bc0fbc4dd2dd47 (diff) | |
download | op-kernel-dev-49c355617f603b8e71ec117c1f940152a998528a.zip op-kernel-dev-49c355617f603b8e71ec117c1f940152a998528a.tar.gz |
Merge branch 'serial-from-alan'
* serial-from-alan: (79 commits)
moxa: prevent opening unavailable ports
imx: serial: use tty_encode_baud_rate to set true rate
imx: serial: add IrDA support to serial driver
imx: serial: use rational library function
lib: isolate rational fractions helper function
imx: serial: handle initialisation failure correctly
imx: serial: be sure to stop xmit upon shutdown
imx: serial: notify higher layers in case xmit IRQ was not called
imx: serial: fix one bit field type
imx: serial: fix whitespaces (no changes in functionality)
tty: use prepare/finish_wait
tty: remove sleep_on
sierra: driver interface blacklisting
sierra: driver urb handling improvements
tty: resolve some sierra breakage
timbuart: Fix the termios logic
serial: Added Timberdale UART driver
tty: Add URL for ttydev queue
devpts: unregister the file system on error
tty: Untangle termios and mm mutex dependencies
...
Diffstat (limited to 'drivers/char/Makefile')
-rw-r--r-- | drivers/char/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 9caf5b5..189efcf 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -13,6 +13,7 @@ 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 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 |