svn commit: r243579 - head/sys/arm/arm

[Marcel Moolenaar]

Author: marcel
Date: Tue Nov 27 01:08:05 2012
New Revision: 243579
URL: http://svnweb.freebsd.org/changeset/base/243579

Log:
  Don't include arm/xscale/i8134x/i81342reg.h when we're compiling LINT.
  The definitions in i81342reg.h clash with those in i80321reg.h.

Modified:
  head/sys/arm/arm/cpufunc.c

Modified: head/sys/arm/arm/cpufunc.c
==============================================================================
--- head/sys/arm/arm/cpufunc.c	Tue Nov 27 01:05:07 2012	(r243578)
+++ head/sys/arm/arm/cpufunc.c	Tue Nov 27 01:08:05 2012	(r243579)
@@ -74,7 +74,13 @@ __FBSDID("$FreeBSD$");
 #include <arm/xscale/i80321/i80321var.h>
 #endif
 
-#if defined(CPU_XSCALE_81342)
+/*
+ * Some definitions in i81342reg.h clash with i80321reg.h.
+ * This only happens for the LINT kernel. As it happens,
+ * we don't need anything from i81342reg.h that we already
+ * got from somewhere else during a LINT compile.
+ */
+#if defined(CPU_XSCALE_81342) && !defined(COMPILING_LINT)
 #include <arm/xscale/i8134x/i81342reg.h>
 #endif