diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /drivers/input/keyboard/stowaway.c | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/input/keyboard/stowaway.c')
| -rw-r--r-- | drivers/input/keyboard/stowaway.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/keyboard/stowaway.c b/drivers/input/keyboard/stowaway.c index f7b5c5b81451..b44b0684d543 100644 --- a/drivers/input/keyboard/stowaway.c +++ b/drivers/input/keyboard/stowaway.c | |||
| @@ -108,8 +108,7 @@ static int skbd_connect(struct serio *serio, struct serio_driver *drv) | |||
| 108 | input_dev->id.vendor = SERIO_STOWAWAY; | 108 | input_dev->id.vendor = SERIO_STOWAWAY; |
| 109 | input_dev->id.product = 0x0001; | 109 | input_dev->id.product = 0x0001; |
| 110 | input_dev->id.version = 0x0100; | 110 | input_dev->id.version = 0x0100; |
| 111 | input_dev->cdev.dev = &serio->dev; | 111 | input_dev->dev.parent = &serio->dev; |
| 112 | input_dev->private = skbd; | ||
| 113 | 112 | ||
| 114 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP); | 113 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP); |
| 115 | input_dev->keycode = skbd->keycode; | 114 | input_dev->keycode = skbd->keycode; |