Merge branch 'linus' into x86/cleanups

[linux-2.6-omap-h63xx.git] / include / linux / rio_drv.h

diff --git a/include/linux/rio_drv.h b/include/linux/rio_drv.h
index 90987b7bcc1be21efcd979f9029dbecb89daf503..32c0547ffafc2906d4ce461a9cf0e3ca0c0e2c52 100644 (file)
--- a/include/linux/rio_drv.h
+++ b/include/linux/rio_drv.h
@@ -427,9 +427,9 @@ void rio_dev_put(struct rio_dev *);
  * Get the unique RIO device identifier. Returns the device
  * identifier string.
  */
-static inline char *rio_name(struct rio_dev *rdev)
+static inline const char *rio_name(struct rio_dev *rdev)
 {
-       return rdev->dev.bus_id;
+       return dev_name(&rdev->dev);
 }
 
 /**