Merge git://git.marvell.com/orion into devel

1 files changed, 2 insertions, 1 deletions

diff --git a/Documentation/input/input-programming.txt b/Documentation/input/input-programming.txt
index 81905e81585e..7f8b9d97bc47 100644
--- a/Documentation/input/input-programming.txt
+++ b/Documentation/input/input-programming.txt
@@ -20,10 +20,11 @@ pressed or released a BUTTON_IRQ happens. The driver could look like:
 
 static struct input_dev *button_dev;
 
-static void button_interrupt(int irq, void *dummy, struct pt_regs *fp)
+static irqreturn_t button_interrupt(int irq, void *dummy)
 {
         input_report_key(button_dev, BTN_0, inb(BUTTON_PORT) & 1);
         input_sync(button_dev);
+        return IRQ_HANDLED;
 }
 
 static int __init button_init(void)