From 6db4d2c963fa5e180bfa582252ba7d0b655029c9 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Mon, 8 Jun 2009 02:55:22 -0700
Subject: [PATCH] --- yaml --- r: 158619 b: refs/heads/master c:
 2f210deba9887dd9143b63b217506f1ac152e91c h: refs/heads/master i:   158617:
 ce935f950ff98add28a818c21dfdd592bbd67946   158615:
 bc902a61ce0a7d3d3546b2012c92a6f095bd2be6 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/kernel/apic/io_apic.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a8fc6f5a4aaa..9bc8237b81c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b2b171a774af256082635b53ac387b1613b7b4c
+refs/heads/master: 2f210deba9887dd9143b63b217506f1ac152e91c
diff --git a/trunk/arch/x86/kernel/apic/io_apic.c b/trunk/arch/x86/kernel/apic/io_apic.c
index 90b5e6efa938..82271eb87bb0 100644
--- a/trunk/arch/x86/kernel/apic/io_apic.c
+++ b/trunk/arch/x86/kernel/apic/io_apic.c
@@ -556,9 +556,9 @@ static void __init replace_pin_at_irq_node(struct irq_cfg *cfg, int node,
 		add_pin_to_irq_node(cfg, node, newapic, newpin);
 }
 
-static inline void io_apic_modify_irq(struct irq_cfg *cfg,
-				int mask_and, int mask_or,
-				void (*final)(struct irq_pin_list *entry))
+static void io_apic_modify_irq(struct irq_cfg *cfg,
+			       int mask_and, int mask_or,
+			       void (*final)(struct irq_pin_list *entry))
 {
 	int pin;
 	struct irq_pin_list *entry;