diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 15:45:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 15:45:18 +1100 |
| commit | 20530516281e94d873ce9ebf7f7365ed241cf9a6 (patch) | |
| tree | 23fa46e3808b38551114cd0c2ab7051e3d2419e4 /drivers/input/gameport/ns558.c | |
| parent | fbda7f6f2981a3e8972f9c8c38d7ef291d8c1eb9 (diff) | |
| parent | a2d781fc8d9b16113dd9440107d73c0f21d7cbef (diff) | |
Merge commit 'input/next'
Diffstat (limited to 'drivers/input/gameport/ns558.c')
| -rw-r--r-- | drivers/input/gameport/ns558.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c index 2b282cde4b89..db556b71ddda 100644 --- a/drivers/input/gameport/ns558.c +++ b/drivers/input/gameport/ns558.c @@ -226,7 +226,7 @@ static int ns558_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *did) ns558->gameport = port; gameport_set_name(port, "NS558 PnP Gameport"); - gameport_set_phys(port, "pnp%s/gameport0", dev->dev.bus_id); + gameport_set_phys(port, "pnp%s/gameport0", dev_name(&dev->dev)); port->dev.parent = &dev->dev; port->io = ioport; |