Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / arch / sparc64 / kernel / power.c

diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c
index 0b9c70627ce4e7537d96422d62ff2ac5feb1ba1f..699b24b890dfc5dc398e6a04ade5bf9f3a8b67c7 100644 (file)
--- a/arch/sparc64/kernel/power.c
+++ b/arch/sparc64/kernel/power.c
@@ -35,7 +35,7 @@ static void __iomem *power_reg;
 static DECLARE_WAIT_QUEUE_HEAD(powerd_wait);
 static int button_pressed;
 
-static irqreturn_t power_handler(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t power_handler(int irq, void *dev_id)
 {
        if (button_pressed == 0) {
                button_pressed = 1;