Merge pobox.com:/garz/repo/netdev-2.6/b44

into pobox.com:/garz/repo/net-drivers-2.6

diff --cc drivers/net/b44.c
index adb24b740ddd127523cb2e38dc04fb03a3b463b7,3266cc064c6563ef6d41a2c85adbb9dcb9708e87..bad611b74906aa0b3e339cd8f35d4634d62996d6
--- 1/drivers/net/b44.c
--- 2/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@@ -1891,9 -1926,9 +1926,9 @@@ static int b44_suspend(struct pci_dev *
  static int b44_resume(struct pci_dev *pdev)
  {
        struct net_device *dev = pci_get_drvdata(pdev);
-       struct b44 *bp = dev->priv;
+       struct b44 *bp = netdev_priv(dev);
  
 -      pci_restore_state(pdev, bp->pci_cfg_state);
 +      pci_restore_state(pdev);
  
        if (!netif_running(dev))
                return 0;

diff --cc drivers/net/b44.h
index 5b4ffd2c2ba85b388834b8e66454fc4cb4befd6d,7182e469748917c1eb0fd9496f0940151dae8df3..f886692f20b44fe04a2088f2c609b6e9359dda13
--- 1/drivers/net/b44.h
--- 2/drivers/net/b44.h
+++ b/drivers/net/b44.h
@@@ -535,8 -433,8 +433,7 @@@ struct b44 
  
        u32                     rx_pending;
        u32                     tx_pending;
 -      u32                     pci_cfg_state[64 / sizeof(u32)];
        u8                      phy_addr;
-       u8                      mdc_port;
        u8                      core_unit;
  
        struct mii_if_info      mii_if;