Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[~andy/linux] / drivers / input / gameport / ns558.c

diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c
index 2b282cde4b89bca7af7010f4127f6cfc93d81a8e..7c217848613ef2a0e2367bf32f36c5b7ed63e1d7 100644 (file)
--- a/drivers/input/gameport/ns558.c
+++ b/drivers/input/gameport/ns558.c
@@ -166,7 +166,7 @@ static int ns558_isa_probe(int io)
 
 #ifdef CONFIG_PNP
 
-static struct pnp_device_id pnp_devids[] = {
+static const struct pnp_device_id pnp_devids[] = {
        { .id = "@P@0001", .driver_data = 0 }, /* ALS 100 */
        { .id = "@P@0020", .driver_data = 0 }, /* ALS 200 */
        { .id = "@P@1001", .driver_data = 0 }, /* ALS 100+ */
@@ -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;