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/spitzkbd.c | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/input/keyboard/spitzkbd.c')
| -rw-r--r-- | drivers/input/keyboard/spitzkbd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c index 8a2166c77ff4..41b80385476c 100644 --- a/drivers/input/keyboard/spitzkbd.c +++ b/drivers/input/keyboard/spitzkbd.c | |||
| @@ -372,10 +372,9 @@ static int __init spitzkbd_probe(struct platform_device *dev) | |||
| 372 | 372 | ||
| 373 | spitzkbd->input = input_dev; | 373 | spitzkbd->input = input_dev; |
| 374 | 374 | ||
| 375 | input_dev->private = spitzkbd; | ||
| 376 | input_dev->name = "Spitz Keyboard"; | 375 | input_dev->name = "Spitz Keyboard"; |
| 377 | input_dev->phys = spitzkbd->phys; | 376 | input_dev->phys = spitzkbd->phys; |
| 378 | input_dev->cdev.dev = &dev->dev; | 377 | input_dev->dev.parent = &dev->dev; |
| 379 | 378 | ||
| 380 | input_dev->id.bustype = BUS_HOST; | 379 | input_dev->id.bustype = BUS_HOST; |
| 381 | input_dev->id.vendor = 0x0001; | 380 | input_dev->id.vendor = 0x0001; |