Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/atl1c/atl1c_ethtool.c b/drivers/net/atl1c/atl1c_ethtool.c
index 9b1e0eaebb5c..32339243d61f 100644
--- a/drivers/net/atl1c/atl1c_ethtool.c
+++ b/drivers/net/atl1c/atl1c_ethtool.c
@@ -22,6 +22,7 @@
 
 #include <linux/netdevice.h>
 #include <linux/ethtool.h>
+#include <linux/slab.h>
 
 #include "atl1c.h"
 
@@ -37,7 +38,7 @@ static int atl1c_get_settings(struct net_device *netdev,
                            SUPPORTED_100baseT_Full |
                            SUPPORTED_Autoneg       |
                            SUPPORTED_TP);
-        if (hw->ctrl_flags & ATL1C_LINK_CAP_1000M)
+        if (hw->link_cap_flags & ATL1C_LINK_CAP_1000M)
                 ecmd->supported |= SUPPORTED_1000baseT_Full;
 
         ecmd->advertising = ADVERTISED_TP;