diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 10:45:25 +0000 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 10:45:25 +0000 |
| commit | a23e66f3b8cfdedec14541e71ef29a754870a20c (patch) | |
| tree | f8ac23572982e92e6f8ae09c4039db627bdf53ee /drivers/input/serio/hil_mlc.c | |
| parent | 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab (diff) | |
| parent | ede6f5aea054d3fb67c78857f7abdee602302043 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/input/serio/hil_mlc.c')
| -rw-r--r-- | drivers/input/serio/hil_mlc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c index 37586a68d34..7ba9f2b2c04 100644 --- a/drivers/input/serio/hil_mlc.c +++ b/drivers/input/serio/hil_mlc.c @@ -934,6 +934,7 @@ int hil_mlc_register(hil_mlc *mlc) snprintf(mlc_serio->name, sizeof(mlc_serio->name)-1, "HIL_SERIO%d", i); snprintf(mlc_serio->phys, sizeof(mlc_serio->phys)-1, "HIL%d", i); mlc_serio->id = hil_mlc_serio_id; + mlc_serio->id.id = i; /* HIL port no. */ mlc_serio->write = hil_mlc_serio_write; mlc_serio->open = hil_mlc_serio_open; mlc_serio->close = hil_mlc_serio_close; |