diff options
Diffstat (limited to 'arch/sh/boards/hp6xx/hp6xx_apm.c')
-rw-r--r-- | arch/sh/boards/hp6xx/hp6xx_apm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/boards/hp6xx/hp6xx_apm.c b/arch/sh/boards/hp6xx/hp6xx_apm.c index 75f91aaae077..219179114f0f 100644 --- a/arch/sh/boards/hp6xx/hp6xx_apm.c +++ b/arch/sh/boards/hp6xx/hp6xx_apm.c | |||
@@ -83,7 +83,7 @@ static int hp6x0_apm_get_info(char *buf, char **start, off_t fpos, int length) | |||
83 | return p - buf; | 83 | return p - buf; |
84 | } | 84 | } |
85 | 85 | ||
86 | static irqreturn_t hp6x0_apm_interrupt(int irq, void *dev, struct pt_regs *regs) | 86 | static irqreturn_t hp6x0_apm_interrupt(int irq, void *dev) |
87 | { | 87 | { |
88 | if (!apm_suspended) | 88 | if (!apm_suspended) |
89 | apm_queue_event(APM_USER_SUSPEND); | 89 | apm_queue_event(APM_USER_SUSPEND); |
@@ -96,7 +96,7 @@ static int __init hp6x0_apm_init(void) | |||
96 | int ret; | 96 | int ret; |
97 | 97 | ||
98 | ret = request_irq(HP680_BTN_IRQ, hp6x0_apm_interrupt, | 98 | ret = request_irq(HP680_BTN_IRQ, hp6x0_apm_interrupt, |
99 | SA_INTERRUPT, MODNAME, 0); | 99 | IRQF_DISABLED, MODNAME, 0); |
100 | if (unlikely(ret < 0)) { | 100 | if (unlikely(ret < 0)) { |
101 | printk(KERN_ERR MODNAME ": IRQ %d request failed\n", | 101 | printk(KERN_ERR MODNAME ": IRQ %d request failed\n", |
102 | HP680_BTN_IRQ); | 102 | HP680_BTN_IRQ); |