From 7b6c17a6dc7ead6a6b159cac7cd63c34d6433ad7 Mon Sep 17 00:00:00 2001
From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date: Thu, 26 Jul 2007 15:31:34 +0900
Subject: [PATCH] --- yaml --- r: 63053 b: refs/heads/master c:
 3c3738c874a2d42e84a2b02768f9807c334f3eff h: refs/heads/master i:   63051:
 589bf9fb991b01c3176628f7177211ddf26ccecf v: v3

---
 [refs]                        | 2 +-
 trunk/arch/ia64/kernel/acpi.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 36e2d4e55b3f..1c61a5522dc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bde71ec1ea1f37254892ef2058176f3171a0d62
+refs/heads/master: 3c3738c874a2d42e84a2b02768f9807c334f3eff
diff --git a/trunk/arch/ia64/kernel/acpi.c b/trunk/arch/ia64/kernel/acpi.c
index c6ede8780ded..3d45d24a9d61 100644
--- a/trunk/arch/ia64/kernel/acpi.c
+++ b/trunk/arch/ia64/kernel/acpi.c
@@ -741,16 +741,15 @@ int __init acpi_boot_init(void)
 
 int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
 {
-	int vector;
+	int tmp;
 
 	if (has_8259 && gsi < 16)
 		*irq = isa_irq_to_vector(gsi);
 	else {
-		vector = gsi_to_vector(gsi);
-		if (vector == -1)
+		tmp = gsi_to_irq(gsi);
+		if (tmp == -1)
 			return -1;
-
-		*irq = vector;
+		*irq = tmp;
 	}
 	return 0;
 }