projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Input: wistron - add support for Acer TravelMate 2424NWXCi
[powerpc.git]
/
drivers
/
serial
/
mpc52xx_uart.c
diff --git
a/drivers/serial/mpc52xx_uart.c
b/drivers/serial/mpc52xx_uart.c
index
6459edc
..
7708e5d
100644
(file)
--- a/
drivers/serial/mpc52xx_uart.c
+++ b/
drivers/serial/mpc52xx_uart.c
@@
-44,7
+44,6
@@
* will be mapped to.
*/
* will be mapped to.
*/
-#include <linux/config.h>
#include <linux/platform_device.h>
#include <linux/module.h>
#include <linux/tty.h>
#include <linux/platform_device.h>
#include <linux/module.h>
#include <linux/tty.h>
@@
-191,7
+190,7
@@
mpc52xx_uart_startup(struct uart_port *port)
/* Request IRQ */
ret = request_irq(port->irq, mpc52xx_uart_int,
/* Request IRQ */
ret = request_irq(port->irq, mpc52xx_uart_int,
-
SA_INTERRUPT | SA
_SAMPLE_RANDOM, "mpc52xx_psc_uart", port);
+
IRQF_DISABLED | IRQF
_SAMPLE_RANDOM, "mpc52xx_psc_uart", port);
if (ret)
return ret;
if (ret)
return ret;
@@
-693,7
+692,6
@@
static struct uart_driver mpc52xx_uart_driver = {
.owner = THIS_MODULE,
.driver_name = "mpc52xx_psc_uart",
.dev_name = "ttyPSC",
.owner = THIS_MODULE,
.driver_name = "mpc52xx_psc_uart",
.dev_name = "ttyPSC",
- .devfs_name = "ttyPSC",
.major = SERIAL_PSC_MAJOR,
.minor = SERIAL_PSC_MINOR,
.nr = MPC52xx_PSC_MAXNUM,
.major = SERIAL_PSC_MAJOR,
.minor = SERIAL_PSC_MINOR,
.nr = MPC52xx_PSC_MAXNUM,
@@
-728,8
+726,7
@@
mpc52xx_uart_probe(struct platform_device *dev)
spin_lock_init(&port->lock);
port->uartclk = __res.bi_ipbfreq / 2; /* Look at CTLR doc */
spin_lock_init(&port->lock);
port->uartclk = __res.bi_ipbfreq / 2; /* Look at CTLR doc */
- port->fifosize = 255; /* Should be 512 ! But it can't be */
- /* stored in a unsigned char */
+ port->fifosize = 512;
port->iotype = UPIO_MEM;
port->flags = UPF_BOOT_AUTOCONF |
( uart_console(port) ? 0 : UPF_IOREMAP );
port->iotype = UPIO_MEM;
port->flags = UPF_BOOT_AUTOCONF |
( uart_console(port) ? 0 : UPF_IOREMAP );