diff --git a/src/sys/include/isa/8259.h b/src/sys/include/isa/8259.h
index 8a12e05..4400519 100644
--- a/src/sys/include/isa/8259.h
+++ b/src/sys/include/isa/8259.h
@@ -44,7 +44,7 @@
 #define ocw3Irr 0x0A // Read IRR                
 #define ocw3Isr 0x0B // Read ISR                
 
-int init8259();
+int 8259_init();
 void irqEnable(uInt16 irqNo);
 void irqDisable(uInt16 irqNo);
 
@@ -52,6 +52,8 @@
 
 /***
  $Log$
+ Revision 1.2  2004/05/21 14:57:16  reddawg
+ Cleaned up
 
  END
  ***/
diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h
index 1766049..a0ab8f3 100644
--- a/src/sys/include/ubixos/init.h
+++ b/src/sys/include/ubixos/init.h
@@ -33,6 +33,7 @@
 #include <vmm/vmm.h>
 #include <ubixos/vitals.h>
 #include <vfs/vfs.h>
+#include <isa/8259.h>
 
 typedef int (*intFunctionPTR)();
 
@@ -54,6 +55,7 @@
   vmm_init,
   vitals_init,
   vfs_init,
+  8259_init,
   };
 
 int init_tasksTotal = sizeof(init_tasks)/sizeof(intFunctionPTR);
diff --git a/src/sys/init/main.c b/src/sys/init/main.c
index 56ae96f..1afa45e 100644
--- a/src/sys/init/main.c
+++ b/src/sys/init/main.c
@@ -41,7 +41,6 @@
 #include <lib/kprintf.h>
 #include <lib/kmalloc.h>
 #include <lib/bioscall.h>
-#include <isa/8259.h>
 #include <isa/pit.h>
 #include <isa/fdc.h>
 #include <isa/atkbd.h>
@@ -95,11 +94,6 @@
 
   //smpInit();     /* Initialize SMP */
 
-  /* Initialize The Systems 8259 Controller/IRQ Handling */
-  if (init8259() != 0x0) {
-    kpanic("Error: Initializing 8259\n");
-    }
-
   /* Initialize The IDT Subsystem */
   if (idtInit() != 0x0) {
     kpanic("Error: Initializing IDT\n");
diff --git a/src/sys/isa/8259.c b/src/sys/isa/8259.c
index 0314362..22a7994 100644
--- a/src/sys/isa/8259.c
+++ b/src/sys/isa/8259.c
@@ -36,14 +36,14 @@
 
 /************************************************************************
 
- Function: int init8259()
+ Function: int 8259_init()
 
  Description: This function will initialize both PICs for all of our IRQs
 
  Notes:
 
 ************************************************************************/
-int init8259() {
+int 8259_init() {
   outportByte(mPic,   icw1); /* Initialize Master PIC           */
   outportByte(sPic,   icw1); /* Initialize Seconary PIC         */
   outportByte(mPic+1, mVec); /* Master Interrup Vector          */
@@ -101,6 +101,9 @@
 
 /***
  $Log$
+ Revision 1.3  2004/05/20 22:51:09  reddawg
+ Cleaned Up Warnings
+
  Revision 1.2  2004/05/10 02:23:24  reddawg
  Minor Changes To Source Code To Prepare It For Open Source Release