From 4b77ede6057b2acb26e51bf191d9fd82fc3dfbf9 Mon Sep 17 00:00:00 2001 From: Tony Luck Date: Thu, 11 Aug 2005 09:43:50 -0700 Subject: [PATCH] --- yaml --- r: 5841 b: refs/heads/master c: 691241315116b962f2161e6190f1678cc65bbe26 h: refs/heads/master i: 5839: bb597f80bd8b2b1125446cf3fb5b6c221dca3dee v: v3 --- [refs] | 2 +- trunk/include/asm-ia64/iosapic.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0ee160705101..f29c43a5419d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bf11e8c708f0e512ed733fc65a50770c5bc7b54 +refs/heads/master: 691241315116b962f2161e6190f1678cc65bbe26 diff --git a/trunk/include/asm-ia64/iosapic.h b/trunk/include/asm-ia64/iosapic.h index 1093f35b3b90..a429fe225b07 100644 --- a/trunk/include/asm-ia64/iosapic.h +++ b/trunk/include/asm-ia64/iosapic.h @@ -75,6 +75,8 @@ extern int __devinit iosapic_init (unsigned long address, unsigned int gsi_base); #ifdef CONFIG_HOTPLUG extern int iosapic_remove (unsigned int gsi_base); +#else +#define iosapic_remove(gsi_base) (-EINVAL) #endif /* CONFIG_HOTPLUG */ extern int gsi_to_vector (unsigned int gsi); extern int gsi_to_irq (unsigned int gsi); @@ -102,9 +104,7 @@ extern void __devinit map_iosapic_to_node (unsigned int, int); #else #define iosapic_system_init(pcat_compat) do { } while (0) #define iosapic_init(address,gsi_base) (-EINVAL) -#ifdef CONFIG_HOTPLUG #define iosapic_remove(gsi_base) (-ENODEV) -#endif /* CONFIG_HOTPLUG */ #define iosapic_register_intr(gsi,polarity,trigger) (gsi) #define iosapic_unregister_intr(irq) do { } while (0) #define iosapic_override_isa_irq(isa_irq,gsi,polarity,trigger) do { } while (0)