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

Commit 5d240918 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-serial

parents cba2fa18 cb3592be

drivers/serial/8250.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static unsigned int share_irqs = SERIAL8250_SHARE_IRQS; 
#define SERIAL_PORT_DFNS

#endif



static struct old_serial_port old_serial_port[] = {

static const struct old_serial_port old_serial_port[] = {

	SERIAL_PORT_DFNS /* defined in asm/serial.h */

};

drivers/serial/8250_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static unsigned short timedia_eight_port[] = { 
	0x9167, 0x9168, 0xA066, 0xA167, 0xA168, 0

};



static struct timedia_struct {

static const struct timedia_struct {

	int num;

	unsigned short *ids;

} timedia_data[] = {

drivers/serial/serial_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1779,7 +1779,7 @@ struct baud_rates { 
	unsigned int cflag;

};



static struct baud_rates baud_rates[] = {

static const struct baud_rates baud_rates[] = {

	{ 921600, B921600 },

	{ 460800, B460800 },

	{ 230400, B230400 },

drivers/serial/serial_cs.c

+3 −3
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ struct multi_id { 
	int multi;		/* 1 = multifunction, > 1 = # ports */

};



static struct multi_id multi_id[] = {

static const struct multi_id multi_id[] = {

	{ MANFID_OMEGA,   PRODID_OMEGA_QSP_100,         4 },

	{ MANFID_QUATECH, PRODID_QUATECH_DUAL_RS232,    2 },

	{ MANFID_QUATECH, PRODID_QUATECH_DUAL_RS232_D1, 2 },
@@ -354,8 +354,8 @@ next_tuple(client_handle_t handle, tuple_t * tuple, cisparse_t * parse) 


static int simple_config(dev_link_t *link)

{

	static kio_addr_t base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };

	static int size_table[2] = { 8, 16 };

	static const kio_addr_t base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };

	static const int size_table[2] = { 8, 16 };

	client_handle_t handle = link->handle;

	struct serial_info *info = link->priv;

	struct serial_cfg_mem *cfg_mem;

include/linux/serial_core.h

+3 −0
Original line number Diff line number Diff line
@@ -121,6 +121,9 @@ 


#define PORT_IP3106	70



/* Hilscher netx */

#define PORT_NETX	71



#ifdef __KERNEL__



#include <linux/config.h>