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-ixp4xx
/
nas100d-power.c
diff --git
a/arch/arm/mach-ixp4xx/nas100d-power.c
b/arch/arm/mach-ixp4xx/nas100d-power.c
index
99d333d
..
29aa98d
100644
(file)
--- a/
arch/arm/mach-ixp4xx/nas100d-power.c
+++ b/
arch/arm/mach-ixp4xx/nas100d-power.c
@@
-17,15
+17,14
@@
*
*/
*
*/
+#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <linux/module.h>
#include <linux/reboot.h>
#include <linux/module.h>
#include <linux/reboot.h>
-#include <linux/interrupt.h>
#include <asm/mach-types.h>
#include <asm/mach-types.h>
-extern void ctrl_alt_del(void);
-
-static irqreturn_t nas100d_reset_handler(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t nas100d_reset_handler(int irq, void *dev_id)
{
/* Signal init to do the ctrlaltdel action, this will bypass init if
* it hasn't started and do a kernel_restart.
{
/* Signal init to do the ctrlaltdel action, this will bypass init if
* it hasn't started and do a kernel_restart.
@@
-43,7
+42,7
@@
static int __init nas100d_power_init(void)
set_irq_type(NAS100D_RB_IRQ, IRQT_LOW);
if (request_irq(NAS100D_RB_IRQ, &nas100d_reset_handler,
set_irq_type(NAS100D_RB_IRQ, IRQT_LOW);
if (request_irq(NAS100D_RB_IRQ, &nas100d_reset_handler,
-
SA_INTERRUPT
, "NAS100D reset button", NULL) < 0) {
+
IRQF_DISABLED
, "NAS100D reset button", NULL) < 0) {
printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
NAS100D_RB_IRQ);
printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
NAS100D_RB_IRQ);