Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / arch / arm / mach-omap1 / serial.c

diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index 9b4cd698bec85d9d05b06371313066579b9d3c41..4cc98a578e4bf5ed98ac048f702f2c519ae7a22d 100644 (file)
--- a/arch/arm/mach-omap1/serial.c
+++ b/arch/arm/mach-omap1/serial.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap1/id.c
+ * linux/arch/arm/mach-omap1/serial.c
  *
  * OMAP1 CPU identification code
  *
@@ -8,10 +8,10 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/serial.h>
 #include <linux/tty.h>
@@ -204,8 +204,7 @@ void __init omap_serial_init(void)
 
 #ifdef CONFIG_OMAP_SERIAL_WAKE
 
-static irqreturn_t omap_serial_wake_interrupt(int irq, void *dev_id,
-                                             struct pt_regs *regs)
+static irqreturn_t omap_serial_wake_interrupt(int irq, void *dev_id)
 {
        /* Need to do something with serial port right after wake-up? */
        return IRQ_HANDLED;
@@ -253,7 +252,7 @@ static void __init omap_serial_set_port_wakeup(int gpio_nr)
        }
        omap_set_gpio_direction(gpio_nr, 1);
        ret = request_irq(OMAP_GPIO_IRQ(gpio_nr), &omap_serial_wake_interrupt,
-                         SA_TRIGGER_RISING, "serial wakeup", NULL);
+                         IRQF_TRIGGER_RISING, "serial wakeup", NULL);
        if (ret) {
                omap_free_gpio(gpio_nr);
                printk(KERN_ERR "No interrupt for UART wake GPIO: %i\n",