Module Name: src Committed By: matt Date: Tue Mar 18 06:46:14 UTC 2014
Modified Files: src/sys/arch/arm/marvell: mvsoc_intr.h Log Message: Only include "opt_mvsoc.h" if _INTR_PRIVATE is defined. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/marvell/mvsoc_intr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arm/marvell/mvsoc_intr.h diff -u src/sys/arch/arm/marvell/mvsoc_intr.h:1.3 src/sys/arch/arm/marvell/mvsoc_intr.h:1.4 --- src/sys/arch/arm/marvell/mvsoc_intr.h:1.3 Wed Nov 20 12:16:47 2013 +++ src/sys/arch/arm/marvell/mvsoc_intr.h Tue Mar 18 06:46:14 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: mvsoc_intr.h,v 1.3 2013/11/20 12:16:47 kiyohara Exp $ */ +/* $NetBSD: mvsoc_intr.h,v 1.4 2014/03/18 06:46:14 matt Exp $ */ /* * Copyright (c) 2010 KIYOHARA Takashi * All rights reserved. @@ -28,11 +28,13 @@ #ifndef _MVSOC_INTR_H_ #define _MVSOC_INTR_H_ +#ifdef _INTR_PRIVATE #include "opt_mvsoc.h" #if defined(ARMADAXP) #define __HAVE_PIC_SET_PRIORITY #endif +#endif #define ARM_IRQ_HANDLER _C_LABEL(mvsoc_irq_handler)