diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-04-16 11:51:52 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-04-16 11:51:52 -0400 |
| commit | 0c387ec88abf4f1ddfe8c3be10ea981bc447b406 (patch) | |
| tree | 7510842a16aa54e3fec96aed2b3126109cda8d85 /drivers/input/mouse | |
| parent | ba28f22e7cf16cb310bb491cbb3f7d0d5d1f5c5d (diff) | |
| parent | 3f3e7c6e139f704e2f48ea3b45ff7724a8d46456 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/pc110pad.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/mouse/pc110pad.c b/drivers/input/mouse/pc110pad.c index f63995f854ff..3941f97cfa60 100644 --- a/drivers/input/mouse/pc110pad.c +++ b/drivers/input/mouse/pc110pad.c | |||
| @@ -108,7 +108,6 @@ static int pc110pad_open(struct input_dev *dev) | |||
| 108 | */ | 108 | */ |
| 109 | static int __init pc110pad_init(void) | 109 | static int __init pc110pad_init(void) |
| 110 | { | 110 | { |
| 111 | struct pci_dev *dev; | ||
| 112 | int err; | 111 | int err; |
| 113 | 112 | ||
| 114 | if (!no_pci_devices()) | 113 | if (!no_pci_devices()) |