Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / orinoco.c

diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index 2a65bb93de26f6b1e87b0af1aba5d6d349e0121f..4e7f6cf5143611d296ff1d9e6cfdf265d360f035 100644 (file)
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -4293,8 +4293,8 @@ static void orinoco_get_drvinfo(struct net_device *dev,
        strncpy(info->driver, DRIVER_NAME, sizeof(info->driver) - 1);
        strncpy(info->version, DRIVER_VERSION, sizeof(info->version) - 1);
        strncpy(info->fw_version, priv->fw_name, sizeof(info->fw_version) - 1);
-       if (dev->class_dev.dev)
-               strncpy(info->bus_info, dev->class_dev.dev->bus_id,
+       if (dev->dev.parent)
+               strncpy(info->bus_info, dev->dev.parent->bus_id,
                        sizeof(info->bus_info) - 1);
        else
                snprintf(info->bus_info, sizeof(info->bus_info) - 1,