projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[powerpc.git]
/
arch
/
sparc64
/
kernel
/
power.c
diff --git
a/arch/sparc64/kernel/power.c
b/arch/sparc64/kernel/power.c
index
0b9c706
..
699b24b
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 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;
{
if (button_pressed == 0) {
button_pressed = 1;