Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[~andy/linux] / drivers / staging / bcm / Bcmnet.c

diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
index 6e8c7f5232148db9110141475351f991addb6b30..a3b91c7ee8ff896102418c4c82b756574df2922a 100644 (file)
--- a/drivers/staging/bcm/Bcmnet.c
+++ b/drivers/staging/bcm/Bcmnet.c
@@ -142,7 +142,7 @@ static void bcm_get_drvinfo(struct net_device *dev,
                            struct ethtool_drvinfo *info)
 {
        struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);
-       PS_INTERFACE_ADAPTER psIntfAdapter = Adapter->pvInterfaceAdapter;
+       struct bcm_interface_adapter *psIntfAdapter = Adapter->pvInterfaceAdapter;
        struct usb_device *udev = interface_to_usbdev(psIntfAdapter->interface);
 
        strcpy(info->driver, DRV_NAME);
@@ -186,7 +186,7 @@ static const struct ethtool_ops bcm_ethtool_ops = {
 int register_networkdev(struct bcm_mini_adapter *Adapter)
 {
        struct net_device *net = Adapter->dev;
-       PS_INTERFACE_ADAPTER IntfAdapter = Adapter->pvInterfaceAdapter;
+       struct bcm_interface_adapter *IntfAdapter = Adapter->pvInterfaceAdapter;
        struct usb_interface *udev = IntfAdapter->interface;
        struct usb_device *xdev = IntfAdapter->udev;
 
@@ -227,7 +227,7 @@ int register_networkdev(struct bcm_mini_adapter *Adapter)
 void unregister_networkdev(struct bcm_mini_adapter *Adapter)
 {
        struct net_device *net = Adapter->dev;
-       PS_INTERFACE_ADAPTER IntfAdapter = Adapter->pvInterfaceAdapter;
+       struct bcm_interface_adapter *IntfAdapter = Adapter->pvInterfaceAdapter;
        struct usb_interface *udev = IntfAdapter->interface;
        struct usb_device *xdev = IntfAdapter->udev;