diff options
| author | marcel <marcel@FreeBSD.org> | 2012-11-27 01:08:05 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2012-11-27 01:08:05 +0000 |
| commit | d5cc776451009ee378dd1fe498567ba7f7c4f844 (patch) | |
| tree | 0de46dbdfc356d3ec2d1ea7ddcf23e1fff7b7dd6 /sys/arm | |
| parent | b0982c796a6309b4e95cdf5ba12e691c9d8ff42b (diff) | |
| download | FreeBSD-src-d5cc776451009ee378dd1fe498567ba7f7c4f844.zip FreeBSD-src-d5cc776451009ee378dd1fe498567ba7f7c4f844.tar.gz | |
Don't include arm/xscale/i8134x/i81342reg.h when we're compiling LINT.
The definitions in i81342reg.h clash with those in i80321reg.h.
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/arm/cpufunc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c index dd43c27..ca08685 100644 --- a/sys/arm/arm/cpufunc.c +++ b/sys/arm/arm/cpufunc.c @@ -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 |
