From owner-svn-src-user@FreeBSD.ORG  Sun Aug 22 16:13:51 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EA4CF1065695;
	Sun, 22 Aug 2010 16:13:51 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DA30D8FC1D;
	Sun, 22 Aug 2010 16:13:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7MGDpwx008626;
	Sun, 22 Aug 2010 16:13:51 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7MGDpOC008624;
	Sun, 22 Aug 2010 16:13:51 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201008221613.o7MGDpOC008624@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 22 Aug 2010 16:13:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211630 -
	user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Aug 2010 16:13:52 -0000

Author: adrian
Date: Sun Aug 22 16:13:51 2010
New Revision: 211630
URL: http://svn.freebsd.org/changeset/base/211630

Log:
  Revert the incorrectly committed part to the last commit.

Modified:
  user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c

Modified: user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
==============================================================================
--- user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c	Sun Aug 22 16:12:44 2010	(r211629)
+++ user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c	Sun Aug 22 16:13:51 2010	(r211630)
@@ -216,9 +216,6 @@ ar5416Attach(uint16_t devid, HAL_SOFTC s
 	ahp = &ahp5416->ah_5212;
 	ah = &ahp->ah_priv.h;
 
-	if (devid == AR5416_AR9100_DEVID)
-		AH_PRIVATE((ah))->ah_macVersion = AR_XSREV_VERSION_9100;
-
 	if (!ar5416SetResetReg(ah, HAL_RESET_POWER_ON)) {
 		/* reset chip */
 		HALDEBUG(ah, HAL_DEBUG_ANY, "%s: couldn't reset chip\n", __func__);
@@ -836,8 +833,6 @@ ar5416Probe(uint16_t vendorid, uint16_t 
 	if (vendorid == ATHEROS_VENDOR_ID &&
 	    (devid == AR5416_DEVID_PCI || devid == AR5416_DEVID_PCIE))
 		return "Atheros 5416";
-	if (vendorid == ATHEROS_VENDOR_ID && devid == AR5416_AR9100_DEVID)
-		return "Atheros 910x";
 	return AH_NULL;
 }
 AH_CHIP(AR5416, ar5416Probe, ar5416Attach);