X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=arch%2Fi386%2Fkernel%2Fi8259.c;h=03abfdb1a6e4c5cb8e4c7e407f0a19e3763de2df;hb=89e07569e4e4e935b2cec18e9d94f131aecb2e40;hp=c8d45821c788f77467535569816d820d395f8a4b;hpb=463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc;p=powerpc.git

diff --git a/arch/i386/kernel/i8259.c b/arch/i386/kernel/i8259.c
index c8d45821c7..03abfdb1a6 100644
--- a/arch/i386/kernel/i8259.c
+++ b/arch/i386/kernel/i8259.c
@@ -41,6 +41,7 @@ static void mask_and_ack_8259A(unsigned int);
 static struct irq_chip i8259A_chip = {
 	.name		= "XT-PIC",
 	.mask		= disable_8259A_irq,
+	.disable	= disable_8259A_irq,
 	.unmask		= enable_8259A_irq,
 	.mask_ack	= mask_and_ack_8259A,
 };
@@ -409,12 +410,6 @@ void __init native_init_IRQ(void)
 	 */
 	intr_init_hook();
 
-	/*
-	 * Set the clock to HZ Hz, we already have a valid
-	 * vector now:
-	 */
-	setup_pit_timer();
-
 	/*
 	 * External FPU? Set up irq13 if so, for
 	 * original braindamaged IBM FERR coupling.