From owner-svn-src-user@FreeBSD.ORG  Mon Jul 12 11:31:14 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 2F1FE106564A;
	Mon, 12 Jul 2010 11:31:14 +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 1F1078FC0A;
	Mon, 12 Jul 2010 11:31:14 +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 o6CBVEYZ083452;
	Mon, 12 Jul 2010 11:31:14 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6CBVEUl083450;
	Mon, 12 Jul 2010 11:31:14 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201007121131.o6CBVEUl083450@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 12 Jul 2010 11:31:14 +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: r209943 -
	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: Mon, 12 Jul 2010 11:31:14 -0000

Author: adrian
Date: Mon Jul 12 11:31:13 2010
New Revision: 209943
URL: http://svn.freebsd.org/changeset/base/209943

Log:
  An evil, temporary workaround (which should likely be a typedef!) so I can
  keep the linux ini file untouched for now.

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

Modified: user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c
==============================================================================
--- user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c	Mon Jul 12 11:26:17 2010	(r209942)
+++ user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c	Mon Jul 12 11:31:13 2010	(r209943)
@@ -29,7 +29,10 @@
 #if 0
 #include "ar5416/ar9160.ini"
 #endif
+/* XXX Temporary workaround so linux-9160.h can be a virgin copy of linux ath9k/initvals.h */
+#define	u32	uint32_t
 #include "ar5416/linux-9160.h"
+#undef u32
 #include "ar5416/ar9160-pcie.h"
 
 static const HAL_PERCAL_DATA ar9160_iq_cal = {		/* multi sample */