As per the default usage in the driver model, don't embed the bus name into the device name Signed-off-by: Dominik Brodowski --- drivers/pcmcia/ds.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: 2.6.10-rc3/drivers/pcmcia/ds.c =================================================================== --- 2.6.10-rc3.orig/drivers/pcmcia/ds.c 2004-12-14 23:44:32.389426418 +0100 +++ 2.6.10-rc3/drivers/pcmcia/ds.c 2004-12-14 23:45:11.605926012 +0100 @@ -600,7 +600,7 @@ p_dev->dev.bus = &pcmcia_bus_type; p_dev->dev.parent = s->parent->dev.dev; p_dev->dev.release = pcmcia_release_dev; - sprintf (p_dev->dev.bus_id, "pcmcia%d.%d", p_dev->socket->sock, p_dev->device_no); + sprintf (p_dev->dev.bus_id, "%d.%d", p_dev->socket->sock, p_dev->device_no); p_dev->dev.driver = &p_drv->drv; /* compat */