summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/powerpc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-04-10 13:05:24 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-04-10 13:05:24 +0000
commitbbd88004c6965e70c4ed660aabd69df07d5252a9 (patch)
tree7360bc2899281397e5eadfb82061270341273c1d /c/src/lib/libbsp/powerpc
parent2003-04-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-bbd88004c6965e70c4ed660aabd69df07d5252a9.tar.bz2
2003-04-10 Joel Sherrill <joel@OARcorp.com>
PR 383/bsps * irq/irq.c: Fix bug introduced by conflicts in previous patches.
Diffstat (limited to 'c/src/lib/libbsp/powerpc')
-rw-r--r--c/src/lib/libbsp/powerpc/shared/ChangeLog5
-rw-r--r--c/src/lib/libbsp/powerpc/shared/irq/irq.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/ChangeLog b/c/src/lib/libbsp/powerpc/shared/ChangeLog
index afb827ba04..c03f4ae3bd 100644
--- a/c/src/lib/libbsp/powerpc/shared/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/shared/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-10 Joel Sherrill <joel@OARcorp.com>
+
+ PR 383/bsps
+ * irq/irq.c: Fix bug introduced by conflicts in previous patches.
+
2003-03-25 Till Straumann <strauman@slac.stanford.edu>
PR 360/bsps
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq.c b/c/src/lib/libbsp/powerpc/shared/irq/irq.c
index 44f3effafa..d45242529b 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/shared/irq/irq.c
@@ -322,7 +322,7 @@ int BSP_rtems_irq_mngt_get(rtems_irq_global_settings** config)
int _BSP_vme_bridge_irq = -1;
-unsigned spuriousIntr = 0;
+unsigned BSP_spuriousIntr = 0;
/*
* High level IRQ handler called from shared_raw_irq_code_entry
*/