diff --git a/[refs] b/[refs] index 0af2b13f5dd9..1f383515648f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bbc0b08db0750c2564578bd1be909bc8f7dee1a +refs/heads/master: 19ab6db66ce1b32de54ecb474f16ade3247f8323 diff --git a/trunk/arch/sparc/kernel/power.c b/trunk/arch/sparc/kernel/power.c index ae88f06a7ec4..e2a045c235a1 100644 --- a/trunk/arch/sparc/kernel/power.c +++ b/trunk/arch/sparc/kernel/power.c @@ -23,7 +23,7 @@ static irqreturn_t power_handler(int irq, void *dev_id) return IRQ_HANDLED; } -static int __init has_button_interrupt(unsigned int irq, struct device_node *dp) +static int __devinit has_button_interrupt(unsigned int irq, struct device_node *dp) { if (irq == 0xffffffff) return 0;