Pull battery into release branch

[linux-2.6-omap-h63xx.git] / drivers / input / keyboard / newtonkbd.c

diff --git a/drivers/input/keyboard/newtonkbd.c b/drivers/input/keyboard/newtonkbd.c
index 179f3a4f4eda8d53104744ca1335f3e29a831f45..b97a41e3ee56cef949835fdc9135f597aefa7850 100644 (file)
--- a/drivers/input/keyboard/newtonkbd.c
+++ b/drivers/input/keyboard/newtonkbd.c
@@ -104,7 +104,7 @@ static int nkbd_connect(struct serio *serio, struct serio_driver *drv)
        input_dev->id.vendor = SERIO_NEWTON;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
+       input_dev->dev.parent = &serio->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
        input_dev->keycode = nkbd->keycode;