From ed358ead019ed7754338d0179ec92265e5d3c6b1 Mon Sep 17 00:00:00 2001
From: Alexander Nyberg <alexn@telia.com>
Date: Thu, 23 Jun 2005 00:08:35 -0700
Subject: [PATCH] --- yaml --- r: 2894 b: refs/heads/master c:
 c0a88c987878e533fc21fbf684198021a3b2c279 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/arch/x86_64/kernel/i8259.c | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index f81105a3f83a..c2c5a443881e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c92c6ffdb16990872acf4ce8b24f82f98fcbbb68
+refs/heads/master: c0a88c987878e533fc21fbf684198021a3b2c279
diff --git a/trunk/arch/x86_64/kernel/i8259.c b/trunk/arch/x86_64/kernel/i8259.c
index 7873d9ba8814..19eafa0aa95c 100644
--- a/trunk/arch/x86_64/kernel/i8259.c
+++ b/trunk/arch/x86_64/kernel/i8259.c
@@ -157,14 +157,13 @@ static unsigned int startup_8259A_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type i8259A_irq_type = {
-	"XT-PIC",
-	startup_8259A_irq,
-	shutdown_8259A_irq,
-	enable_8259A_irq,
-	disable_8259A_irq,
-	mask_and_ack_8259A,
-	end_8259A_irq,
-	NULL
+	.typename = "XT-PIC",
+	.startup = startup_8259A_irq,
+	.shutdown = shutdown_8259A_irq,
+	.enable = enable_8259A_irq,
+	.disable = disable_8259A_irq,
+	.ack = mask_and_ack_8259A,
+	.end = end_8259A_irq,
 };
 
 /*