kernel: update to 2.6.32.10
SVN-Revision: 20444
This commit is contained in:
@@ -12,7 +12,7 @@ BOARDNAME:=Intel IXP4xx
|
||||
FEATURES:=squashfs
|
||||
SUBTARGETS=generic harddisk
|
||||
|
||||
LINUX_VERSION:=2.6.32.9
|
||||
LINUX_VERSION:=2.6.32.10
|
||||
|
||||
include $(INCLUDE_DIR)/target.mk
|
||||
|
||||
|
||||
@@ -124,7 +124,7 @@
|
||||
unsigned int custom_divisor;
|
||||
--- a/drivers/serial/8250.c
|
||||
+++ b/drivers/serial/8250.c
|
||||
@@ -406,6 +406,20 @@ static void mem_serial_out(struct uart_p
|
||||
@@ -409,6 +409,20 @@ static void mem_serial_out(struct uart_p
|
||||
writeb(value, p->membase + offset);
|
||||
}
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
static void mem32_serial_out(struct uart_port *p, int offset, int value)
|
||||
{
|
||||
offset = map_8250_out_reg(p, offset) << p->regshift;
|
||||
@@ -499,6 +513,11 @@ static void set_io_from_upio(struct uart
|
||||
@@ -502,6 +516,11 @@ static void set_io_from_upio(struct uart
|
||||
p->serial_out = mem32_serial_out;
|
||||
break;
|
||||
|
||||
@@ -157,7 +157,7 @@
|
||||
#ifdef CONFIG_SERIAL_8250_AU1X00
|
||||
case UPIO_AU:
|
||||
p->serial_in = au_serial_in;
|
||||
@@ -531,6 +550,7 @@ serial_out_sync(struct uart_8250_port *u
|
||||
@@ -534,6 +553,7 @@ serial_out_sync(struct uart_8250_port *u
|
||||
switch (p->iotype) {
|
||||
case UPIO_MEM:
|
||||
case UPIO_MEM32:
|
||||
@@ -165,7 +165,7 @@
|
||||
#ifdef CONFIG_SERIAL_8250_AU1X00
|
||||
case UPIO_AU:
|
||||
#endif
|
||||
@@ -2449,6 +2469,7 @@ static int serial8250_request_std_resour
|
||||
@@ -2450,6 +2470,7 @@ static int serial8250_request_std_resour
|
||||
case UPIO_MEM32:
|
||||
case UPIO_MEM:
|
||||
case UPIO_DWAPB:
|
||||
@@ -173,7 +173,7 @@
|
||||
if (!up->port.mapbase)
|
||||
break;
|
||||
|
||||
@@ -2486,6 +2507,7 @@ static void serial8250_release_std_resou
|
||||
@@ -2487,6 +2508,7 @@ static void serial8250_release_std_resou
|
||||
case UPIO_MEM32:
|
||||
case UPIO_MEM:
|
||||
case UPIO_DWAPB:
|
||||
@@ -181,7 +181,7 @@
|
||||
if (!up->port.mapbase)
|
||||
break;
|
||||
|
||||
@@ -2958,6 +2980,7 @@ static int __devinit serial8250_probe(st
|
||||
@@ -2959,6 +2981,7 @@ static int __devinit serial8250_probe(st
|
||||
port.serial_in = p->serial_in;
|
||||
port.serial_out = p->serial_out;
|
||||
port.dev = &dev->dev;
|
||||
@@ -189,7 +189,7 @@
|
||||
if (share_irqs)
|
||||
port.irqflags |= IRQF_SHARED;
|
||||
ret = serial8250_register_port(&port);
|
||||
@@ -3108,6 +3131,7 @@ int serial8250_register_port(struct uart
|
||||
@@ -3109,6 +3132,7 @@ int serial8250_register_port(struct uart
|
||||
uart->port.iotype = port->iotype;
|
||||
uart->port.flags = port->flags | UPF_BOOT_AUTOCONF;
|
||||
uart->port.mapbase = port->mapbase;
|
||||
|
||||
Reference in New Issue
Block a user