[S390] xpram off by one error.

[linux-2.6] / drivers / serial / at91_serial.c

diff --git a/drivers/serial/at91_serial.c b/drivers/serial/at91_serial.c
index db5b25fafed42dfc36261dc6a4232e88d068f18a..54c6b2adf7b73c57a2023768a8e11b6cc545bd9e 100644 (file)
--- a/drivers/serial/at91_serial.c
+++ b/drivers/serial/at91_serial.c
@@ -22,7 +22,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/tty.h>
 #include <linux/ioport.h>
@@ -42,6 +41,7 @@
 #include <asm/mach/serial_at91.h>
 #include <asm/arch/board.h>
 #include <asm/arch/system.h>
+#include <asm/arch/gpio.h>
 
 #if defined(CONFIG_SERIAL_AT91_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
@@ -141,9 +141,9 @@ static void at91_set_mctrl(struct uart_port *port, u_int mctrl)
                 */
                if (port->mapbase == AT91_BASE_US0) {
                        if (mctrl & TIOCM_RTS)
-                               at91_sys_write(AT91_PIOA + PIO_CODR, AT91_PA21_RTS0);
+                               at91_set_gpio_value(AT91_PIN_PA21, 0);
                        else
-                               at91_sys_write(AT91_PIOA + PIO_SODR, AT91_PA21_RTS0);
+                               at91_set_gpio_value(AT91_PIN_PA21, 1);
                }
        }
 
@@ -388,7 +388,7 @@ static int at91_startup(struct uart_port *port)
        /*
         * Allocate the IRQ
         */
-       retval = request_irq(port->irq, at91_interrupt, SA_SHIRQ, "at91_serial", port);
+       retval = request_irq(port->irq, at91_interrupt, IRQF_SHARED, "at91_serial", port);
        if (retval) {
                printk("at91_serial: at91_startup - Can't get irq\n");
                return retval;
@@ -863,7 +863,6 @@ static struct uart_driver at91_uart = {
        .owner                  = THIS_MODULE,
        .driver_name            = "at91_serial",
        .dev_name               = AT91_DEVICENAME,
-       .devfs_name             = AT91_DEVICENAME,
        .major                  = SERIAL_AT91_MAJOR,
        .minor                  = MINOR_START,
        .nr                     = AT91_NR_UART,