Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

[linux-2.6] / drivers / input / keyboard / omap-keypad.c

diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index d436287d1d2edcc5ff62abdfb77f3202e7c577ae..3a228634f1015239aae5f669c035b401613f90b7 100644 (file)
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -97,8 +97,7 @@ static u8 get_row_gpio_val(struct omap_kp *omap_kp)
 #define                get_row_gpio_val(x)     0
 #endif
 
-static irqreturn_t omap_kp_interrupt(int irq, void *dev_id,
-                                    struct pt_regs *regs)
+static irqreturn_t omap_kp_interrupt(int irq, void *dev_id)
 {
        struct omap_kp *omap_kp = dev_id;
 
@@ -371,8 +370,7 @@ static int __init omap_kp_probe(struct platform_device *pdev)
                set_bit(keymap[i] & KEY_MAX, input_dev->keybit);
        input_dev->name = "omap-keypad";
        input_dev->phys = "omap-keypad/input0";
-       input_dev->cdev.dev = &pdev->dev;
-       input_dev->private = omap_kp;
+       input_dev->dev.parent = &pdev->dev;
 
        input_dev->id.bustype = BUS_HOST;
        input_dev->id.vendor = 0x0001;