Merge branch 'master' of git://git.denx.de/u-boot

[karo-tx-uboot.git] / arch / x86 / lib / pcat_interrupts.c

diff --git a/arch/x86/lib/pcat_interrupts.c b/arch/x86/lib/pcat_interrupts.c
index f388db22761e9c19d2160a34e37461088401f1a0..a9af87e4ce418f64b26b7b20f54fd9e62fccd851 100644 (file)
--- a/arch/x86/lib/pcat_interrupts.c
+++ b/arch/x86/lib/pcat_interrupts.c
@@ -24,12 +24,10 @@
 #error "CONFIG_SYS_NUM_IRQS must equal 16 if CONFIG_SYS_NUM_IRQS is defined"
 #endif
 
-int interrupt_init(void)
+int i8259_init(void)
 {
        u8 i;
 
-       disable_interrupts();
-
        /* Mask all interrupts */
        outb(0xff, MASTER_PIC + IMR);
        outb(0xff, SLAVE_PIC + IMR);
@@ -65,11 +63,6 @@ int interrupt_init(void)
        /* Interrupt 9 should be level triggered (SCI). The OS might do this */
        configure_irq_trigger(9, true);
 
-       /* Initialize core interrupt and exception functionality of CPU */
-       cpu_init_interrupts();
-
-       enable_interrupts();
-
        return 0;
 }