1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 6459edc7f5c5..7708e5dd3656 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -44,7 +44,6 @@
  * will be mapped to.
  */
 
-#include <linux/config.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,
-                SA_INTERRUPT | SA_SAMPLE_RANDOM, "mpc52xx_psc_uart", port);
+                IRQF_DISABLED | IRQF_SAMPLE_RANDOM, "mpc52xx_psc_uart", port);
         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",
-        .devfs_name     = "ttyPSC",
         .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 */
-        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 );