omap: i2c: add a timeout to the busy waiting

[safe/jmp/linux-2.6] / drivers / ssb / pcihost_wrapper.c

diff --git a/drivers/ssb/pcihost_wrapper.c b/drivers/ssb/pcihost_wrapper.c
index e82db4a..6536a04 100644 (file)
--- a/drivers/ssb/pcihost_wrapper.c
+++ b/drivers/ssb/pcihost_wrapper.c
@@ -12,6 +12,7 @@
  */
 
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <linux/ssb/ssb.h>
 
 
@@ -65,7 +66,7 @@ static int ssb_pcihost_probe(struct pci_dev *dev,
        err = pci_enable_device(dev);
        if (err)
                goto err_kfree_ssb;
-       name = dev->dev.bus_id;
+       name = dev_name(&dev->dev);
        if (dev->driver && dev->driver->name)
                name = dev->driver->name;
        err = pci_request_regions(dev, name);