Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[linux-2.6] / drivers / input / joystick / cobra.c

diff --git a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c
index 207536377fa8b9d4dce85c54f7efcf639f230e13..d3352a849b85f592b08df3140af53c0b594c0366 100644 (file)
--- a/drivers/input/joystick/cobra.c
+++ b/drivers/input/joystick/cobra.c
@@ -211,7 +211,7 @@ static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv)
                input_dev->id.vendor = GAMEPORT_ID_VENDOR_CREATIVE;
                input_dev->id.product = 0x0008;
                input_dev->id.version = 0x0100;
-               input_dev->cdev.dev = &gameport->dev;
+               input_dev->dev.parent = &gameport->dev;
 
                input_set_drvdata(input_dev, cobra);