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

Commit 7f02ab3c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (25 commits)
  serial: Tidy REMOTE_DEBUG
  serial: isicomm: handle running out of slots
  serial: bfin_sport_uart: Use resource size to fix off-by-one error
  tty: fix obsolete comment on tty_insert_flip_string_fixed_flag
  serial: Add driver for the Altera UART
  serial: Add driver for the Altera JTAG UART
  serial: timbuart: make sure last byte is sent when port is closed
  serial: two branches the same in timbuart_set_mctrl()
  serial: uartlite: move from byte accesses to word accesses
  tty: n_gsm: depends on NET
  tty: n_gsm line discipline
  serial: TTY: new ldiscs for staging
  serial: bfin_sport_uart: drop redundant cpu depends
  serial: bfin_sport_uart: drop the experimental markings
  serial: bfin_sport_uart: pull in bfin_sport.h for SPORT defines
  serial: bfin_sport_uart: only enable SPORT TX if data is to be sent
  serial: bfin_sport_uart: drop useless status masks
  serial: bfin_sport_uart: zero sport_uart_port if allocated dynamically
  serial: bfin_sport_uart: protect changes to uart_port
  serial: bfin_sport_uart: add support for CTS/RTS via GPIOs
  ...
parents d6fb1db0 0dbb5671

drivers/char/Kconfig

+9 −1
Original line number Diff line number Diff line
@@ -276,11 +276,19 @@ config N_HDLC 
	  Allows synchronous HDLC communications with tty device drivers that

	  support synchronous HDLC such as the Microgate SyncLink adapter.



	  This driver can only be built as a module ( = code which can be

	  This driver can be built as a module ( = code which can be

	  inserted in and removed from the running kernel whenever you want).

	  The module will be called n_hdlc. If you want to do that, say M

	  here.



config N_GSM

	tristate "GSM MUX line discipline support (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	depends on NET

	help

	  This line discipline provides support for the GSM MUX protocol and

	  presents the mux as a set of 61 individual tty devices.



config RISCOM8

	tristate "SDL RISCom/8 card support"

	depends on SERIAL_NONSTANDARD

drivers/char/Makefile

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

drivers/char/isicom.c

+7 −1
Original line number Diff line number Diff line
@@ -1573,11 +1573,16 @@ static int __devinit isicom_probe(struct pci_dev *pdev, 
	dev_info(&pdev->dev, "ISI PCI Card(Device ID 0x%x)\n", ent->device);



	/* allot the first empty slot in the array */

	for (index = 0; index < BOARD_COUNT; index++)

	for (index = 0; index < BOARD_COUNT; index++) {

		if (isi_card[index].base == 0) {

			board = &isi_card[index];

			break;

		}

	}

	if (index == BOARD_COUNT) {

		retval = -ENODEV;

		goto err_disable;

	}



	board->index = index;

	board->base = pci_resource_start(pdev, 3);
@@ -1624,6 +1629,7 @@ static int __devinit isicom_probe(struct pci_dev *pdev, 
errdec:

	board->base = 0;

	card_count--;

err_disable:

	pci_disable_device(pdev);

err:

	return retval;