From owner-svn-src-head@FreeBSD.ORG  Tue Nov 27 01:10:59 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 18C75675;
 Tue, 27 Nov 2012 01:10:59 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F083B8FC15;
 Tue, 27 Nov 2012 01:10:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAR1Aw9G030133;
 Tue, 27 Nov 2012 01:10:58 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAR1Aw7B030132;
 Tue, 27 Nov 2012 01:10:58 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201211270110.qAR1Aw7B030132@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 27 Nov 2012 01:10:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243580 - head/sys/arm/mv
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Nov 2012 01:10:59 -0000

Author: marcel
Date: Tue Nov 27 01:10:58 2012
New Revision: 243580
URL: http://svnweb.freebsd.org/changeset/base/243580

Log:
  Allow building LINT by defining both SAMPLE_AT_RESET on the one hand
  and SAMPLE_AT_RESET_{LO|HI} on the other. It doesn't matter which
  values they take, as long as they are defined.

Modified:
  head/sys/arm/mv/mvreg.h

Modified: head/sys/arm/mv/mvreg.h
==============================================================================
--- head/sys/arm/mv/mvreg.h	Tue Nov 27 01:08:05 2012	(r243579)
+++ head/sys/arm/mv/mvreg.h	Tue Nov 27 01:10:58 2012	(r243580)
@@ -336,14 +336,15 @@
 #define SAMPLE_AT_RESET		0x10
 #elif defined(SOC_MV_KIRKWOOD)
 #define SAMPLE_AT_RESET		0x30
-#elif defined(SOC_MV_DISCOVERY)
+#elif defined(SOC_MV_FREY)
+#define SAMPLE_AT_RESET		0x100
+#endif
+#if defined(SOC_MV_DISCOVERY)
 #define SAMPLE_AT_RESET_LO	0x30
 #define SAMPLE_AT_RESET_HI	0x34
 #elif defined(SOC_MV_DOVE)
 #define SAMPLE_AT_RESET_LO	0x14
 #define SAMPLE_AT_RESET_HI	0x18
-#elif defined(SOC_MV_FREY)
-#define SAMPLE_AT_RESET		0x100
 #elif defined(SOC_MV_ARMADAXP)
 #define SAMPLE_AT_RESET_LO	0x30
 #define SAMPLE_AT_RESET_HI	0x34