From 84081d8eb7c89c9607ffbb668e18a2db76af6cb7 Mon Sep 17 00:00:00 2001
From: Denis Kirjanov <dkirjanov@hera.kernel.org>
Date: Fri, 3 Sep 2010 10:05:41 +0000
Subject: [PATCH] --- yaml --- r: 214301 b: refs/heads/master c:
 a5d31e0faf025ca8f64b85fc6938b702105725b7 h: refs/heads/master i:   214299:
 b4f2fc440e2cc096e02a871cc5340d313e07db82 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/ns83820.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 56a7721c6222..2c29b34a0f04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c083edc6d0d53a050672b15e3594d07d81b42e5
+refs/heads/master: a5d31e0faf025ca8f64b85fc6938b702105725b7
diff --git a/trunk/drivers/net/ns83820.c b/trunk/drivers/net/ns83820.c
index 379af3e4edcc..3bbd0aab17e8 100644
--- a/trunk/drivers/net/ns83820.c
+++ b/trunk/drivers/net/ns83820.c
@@ -1298,7 +1298,8 @@ static int ns83820_get_settings(struct net_device *ndev,
 		cmd->speed = SPEED_10;
 		break;
 	}
-	cmd->autoneg = (tbicr & TBICR_MR_AN_ENABLE) ? 1: 0;
+	cmd->autoneg = (tbicr & TBICR_MR_AN_ENABLE)
+		? AUTONEG_ENABLE : AUTONEG_DISABLE;
 	return 0;
 }