git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
mach-omap1
/
serial.c
diff --git
a/arch/arm/mach-omap1/serial.c
b/arch/arm/mach-omap1/serial.c
index
e924e0c
..
4cc98a5
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
*
*
* OMAP1 CPU identification code
*
@@
-8,10
+8,10
@@
* published by the Free Software Foundation.
*/
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.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>
#include <linux/delay.h>
#include <linux/serial.h>
#include <linux/tty.h>
@@
-30,9
+30,9
@@
#include <asm/arch/pm.h>
#endif
#include <asm/arch/pm.h>
#endif
-static struct clk * uart1_ck
= NULL
;
-static struct clk * uart2_ck
= NULL
;
-static struct clk * uart3_ck
= NULL
;
+static struct clk * uart1_ck;
+static struct clk * uart2_ck;
+static struct clk * uart3_ck;
static inline unsigned int omap_serial_in(struct plat_serial8250_port *up,
int offset)
static inline unsigned int omap_serial_in(struct plat_serial8250_port *up,
int offset)
@@
-204,8
+204,7
@@
void __init omap_serial_init(void)
#ifdef CONFIG_OMAP_SERIAL_WAKE
#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;
{
/* 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,
}
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",
if (ret) {
omap_free_gpio(gpio_nr);
printk(KERN_ERR "No interrupt for UART wake GPIO: %i\n",