From d5bbaa891f0a0c0c2720a13265f2f75b3ec091d8 Mon Sep 17 00:00:00 2001
From: Jennifer Averett <Jennifer.Averett@OARcorp.com>
Date: Fri, 6 May 2005 19:50:28 +0000
Subject: [PATCH] 2005-05-06	Jennifer Averett
 <jennifer.averett@oarcorp.com>

	* clock/ckinit.c, console/console.c, include/bsp.h, startup/bspstart.c:
	Moved irq.h to bsp subdirectory.
---
 c/src/lib/libbsp/i386/i386ex/ChangeLog          | 5 +++++
 c/src/lib/libbsp/i386/i386ex/clock/ckinit.c     | 2 +-
 c/src/lib/libbsp/i386/i386ex/console/console.c  | 2 +-
 c/src/lib/libbsp/i386/i386ex/include/bsp.h      | 2 +-
 c/src/lib/libbsp/i386/i386ex/startup/bspstart.c | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog
index 2d77bd18b8..f4a151600e 100644
--- a/c/src/lib/libbsp/i386/i386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06      Jennifer Averett <jennifer.averett@oarcorp.com>
+
+        * clock/ckinit.c, console/console.c, include/bsp.h, startup/bspstart.c:
+        Moved irq.h to bsp subdirectory.
+
 2005-05-03      Jennifer Averett <jennifer.averett@oarcorp.com>
 
         * clock/ckinit.c, console/console.c: Added support for 
diff --git a/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c b/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c
index 5cd51715d2..5619c26503 100644
--- a/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c
+++ b/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c
@@ -25,7 +25,7 @@
 #define TMRCFG    0xF834
 
 #include <bsp.h>
-#include <irq.h>
+#include <bsp/irq.h>
 
 #include <rtems/libio.h>
 
diff --git a/c/src/lib/libbsp/i386/i386ex/console/console.c b/c/src/lib/libbsp/i386/i386ex/console/console.c
index 6000f8499d..de6a332eb9 100644
--- a/c/src/lib/libbsp/i386/i386ex/console/console.c
+++ b/c/src/lib/libbsp/i386/i386ex/console/console.c
@@ -37,7 +37,7 @@
 #include <assert.h>
 
 #include <bsp.h>
-#include <irq.h>
+#include <bsp/irq.h>
 #include <rtems/libio.h>
 #include <rtems/error.h>
 #include <termios.h>
diff --git a/c/src/lib/libbsp/i386/i386ex/include/bsp.h b/c/src/lib/libbsp/i386/i386ex/include/bsp.h
index ee6d39782b..829b3fc2f5 100644
--- a/c/src/lib/libbsp/i386/i386ex/include/bsp.h
+++ b/c/src/lib/libbsp/i386/i386ex/include/bsp.h
@@ -26,7 +26,7 @@ extern "C" {
 #include <rtems/clockdrv.h>
 #include <rtems/bspIo.h>
 #include <libcpu/cpu.h>
-#include <irq.h>
+#include <bsp/irq.h>
 
 /*
  *  confdefs.h overrides for this BSP:
diff --git a/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c b/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c
index bae7d70151..1b38ef3b82 100644
--- a/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c
+++ b/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c
@@ -23,7 +23,7 @@
 void bsp_clean_up(void);
 
 #include <bsp.h>
-#include <irq.h>
+#include <bsp/irq.h>
 #include <rtems/libio.h>
 #include <rtems/libcsupport.h>