Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce86d35d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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/
parents b4779583 0f66e50a

arch/blackfin/include/asm/bfin_serial.h

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#define __BFIN_ASM_SERIAL_H__



#include <linux/serial_core.h>

#include <linux/spinlock.h>

#include <mach/anomaly.h>

#include <mach/bfin_serial.h>
@@ -41,6 +42,7 @@ struct bfin_serial_port { 
	struct circ_buf rx_dma_buf;

	struct timer_list rx_dma_timer;

	int rx_dma_nrows;

	spinlock_t rx_lock;

	unsigned int tx_dma_channel;

	unsigned int rx_dma_channel;

	struct work_struct tx_dma_workqueue;

drivers/char/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.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_VIRTIO_CONSOLE)	+= virtio_console.o

obj-$(CONFIG_RAW_DRIVER)	+= raw.o

obj-$(CONFIG_SGI_SNSC)		+= snsc.o snsc_event.o

obj-$(CONFIG_MSPEC)		+= mspec.o

drivers/tty/hvc/virtio_console.c→drivers/char/virtio_console.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <linux/virtio_console.h>

#include <linux/wait.h>

#include <linux/workqueue.h>

#include "hvc_console.h"

#include "../tty/hvc/hvc_console.h"



/*

 * This is a global struct for storing common data for all the devices

drivers/tty/hvc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/tty/n_gsm.c

+1 −0
Original line number Diff line number Diff line
@@ -2414,6 +2414,7 @@ static int gsmld_config(struct tty_struct *tty, struct gsm_mux *gsm, 


	gsm->initiator = c->initiator;

	gsm->mru = c->mru;

	gsm->mtu = c->mtu;

	gsm->encoding = c->encapsulation;

	gsm->adaption = c->adaption;

	gsm->n2 = c->n2;