diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
| commit | 414f746d232d41ed6ae8632c4495ae795373c44b (patch) | |
| tree | 167f9bc8f139c6e82e6732b38c7a938b8a9d31cd /arch/arm/mach-omap1/board-palmz71.c | |
| parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'arch/arm/mach-omap1/board-palmz71.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-palmz71.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index e020c2774606..34389b63b0ec 100644 --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c | |||
| @@ -298,11 +298,11 @@ palmz71_powercable(int irq, void *dev_id) | |||
| 298 | if (omap_get_gpio_datain(PALMZ71_USBDETECT_GPIO)) { | 298 | if (omap_get_gpio_datain(PALMZ71_USBDETECT_GPIO)) { |
| 299 | printk(KERN_INFO "PM: Power cable connected\n"); | 299 | printk(KERN_INFO "PM: Power cable connected\n"); |
| 300 | set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO), | 300 | set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO), |
| 301 | IRQT_FALLING); | 301 | IRQ_TYPE_EDGE_FALLING); |
| 302 | } else { | 302 | } else { |
| 303 | printk(KERN_INFO "PM: Power cable disconnected\n"); | 303 | printk(KERN_INFO "PM: Power cable disconnected\n"); |
| 304 | set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO), | 304 | set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO), |
| 305 | IRQT_RISING); | 305 | IRQ_TYPE_EDGE_RISING); |
| 306 | } | 306 | } |
| 307 | return IRQ_HANDLED; | 307 | return IRQ_HANDLED; |
| 308 | } | 308 | } |