From: Andrew Morton <akpm@osdl.org>

Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/input/keyboard/stowaway.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/input/keyboard/stowaway.c~stowaway-vs-driver-tree drivers/input/keyboard/stowaway.c
--- a/drivers/input/keyboard/stowaway.c~stowaway-vs-driver-tree
+++ a/drivers/input/keyboard/stowaway.c
@@ -109,7 +109,7 @@ static int skbd_connect(struct serio *se
 	input_dev->id.vendor = SERIO_STOWAWAY;
 	input_dev->id.product = 0x0001;
 	input_dev->id.version = 0x0100;
-	input_dev->cdev.dev = &serio->dev;
+	input_dev->d.parent = &serio->dev;
 	input_dev->private = skbd;
 
 	input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
_