diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2007-04-12 01:35:26 -0400 |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-04-12 01:35:26 -0400 |
commit | 935e658e89678a7e3427b90cd7a1c86025d95bfe (patch) | |
tree | 002d0f937e92cd074d5f1a9023fe36a9dda7ba65 /drivers/input/joystick/warrior.c | |
parent | a5394fb075a80212765ee3cd4a7842bdccf5fc0a (diff) |
Input: joysticks - switch to using input_dev->dev.parent
In preparation for struct class_device -> struct device input
core conversion, switch to using input_dev->dev.parent when
specifying device position in sysfs tree.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/joystick/warrior.c')
-rw-r--r-- | drivers/input/joystick/warrior.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/warrior.c b/drivers/input/joystick/warrior.c index e0927a562905..4e85f72eefd7 100644 --- a/drivers/input/joystick/warrior.c +++ b/drivers/input/joystick/warrior.c | |||
@@ -160,7 +160,7 @@ static int warrior_connect(struct serio *serio, struct serio_driver *drv) | |||
160 | input_dev->id.vendor = SERIO_WARRIOR; | 160 | input_dev->id.vendor = SERIO_WARRIOR; |
161 | input_dev->id.product = 0x0001; | 161 | input_dev->id.product = 0x0001; |
162 | input_dev->id.version = 0x0100; | 162 | input_dev->id.version = 0x0100; |
163 | input_dev->cdev.dev = &serio->dev; | 163 | input_dev->dev.parent = &serio->dev; |
164 | 164 | ||
165 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS); | 165 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS); |
166 | input_dev->keybit[LONG(BTN_TRIGGER)] = BIT(BTN_TRIGGER) | BIT(BTN_THUMB) | BIT(BTN_TOP) | BIT(BTN_TOP2); | 166 | input_dev->keybit[LONG(BTN_TRIGGER)] = BIT(BTN_TRIGGER) | BIT(BTN_THUMB) | BIT(BTN_TOP) | BIT(BTN_TOP2); |