diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-10 12:19:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-10 12:19:58 -0800 |
| commit | ce86d35d2fd119d777fc72736732c8c9c3456698 (patch) | |
| tree | 531b2077d9db6b44285ad75196672b4d102e8f20 /drivers/tty/hvc/Makefile | |
| parent | b477958314796f51c54829dbaea89b1f46dabd06 (diff) | |
| parent | 0f66e50af53d39edebf4bc64ef90077e738c171f (diff) | |
| download | blackbird-op-linux-ce86d35d2fd119d777fc72736732c8c9c3456698.tar.gz blackbird-op-linux-ce86d35d2fd119d777fc72736732c8c9c3456698.zip | |
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
serial: bfin_5xx: split uart RX lock from uart port lock to avoid deadlock
68360serial: Plumb in rs_360_get_icount()
n_gsm: copy mtu over when configuring via ioctl interface
virtio: console: Move file back to drivers/char/
Diffstat (limited to 'drivers/tty/hvc/Makefile')
| -rw-r--r-- | drivers/tty/hvc/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile index e6bed5f177ff..d79e7e9bf9d2 100644 --- a/drivers/tty/hvc/Makefile +++ b/drivers/tty/hvc/Makefile @@ -10,4 +10,3 @@ obj-$(CONFIG_HVC_XEN) += hvc_xen.o obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o obj-$(CONFIG_HVCS) += hvcs.o -obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o |
