From f85ad0761861d84f671c6576df9cdcbb2e84a0ef Mon Sep 17 00:00:00 2001
From: Till Straumann <strauman@slac.stanford.edu>
Date: Fri, 11 Sep 2009 16:57:07 +0000
Subject: 2009-09-11	Till Straumann <strauman@slac.stanford.edu>

	* irq/openpic_i8259_irq.c: Do not include <bsp/VMEConfig.h>
	if the bsp.h defines HAVE_NO_VME so that BSPs w/o VME do not
	have to create a dummy VMEConfig.h header.
---
 c/src/lib/libbsp/powerpc/ChangeLog                      | 6 ++++++
 c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c | 2 ++
 2 files changed, 8 insertions(+)

(limited to 'c')

diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog
index b788422bc9..85658586cb 100644
--- a/c/src/lib/libbsp/powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-11	Till Straumann <strauman@slac.stanford.edu>
+
+	* irq/openpic_i8259_irq.c: Do not include <bsp/VMEConfig.h>
+	if the bsp.h defines HAVE_NO_VME so that BSPs w/o VME do not
+	have to create a dummy VMEConfig.h header.
+
 2009-09-09	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	PR 1435/bsps
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c b/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c
index 1f1f98f2b4..be3b11470d 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c
+++ b/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c
@@ -17,7 +17,9 @@
 #include <bsp.h>
 #include <bsp/irq.h>
 #include <bsp/irq_supp.h>
+#ifndef BSP_HAS_NO_VME
 #include <bsp/VMEConfig.h>
+#endif
 #include <bsp/openpic.h>
 #include <libcpu/raw_exception.h>
 #include <libcpu/io.h>
-- 
cgit v1.2.3