diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-17 13:08:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-17 13:08:17 -0700 |
| commit | d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b (patch) | |
| tree | 7887d95ec36087946a2c4b4c9ee0850c361fe22f /include | |
| parent | c231c7db30faf93419fc22d680f74d816bea70e2 (diff) | |
| parent | c149ec05dcd09d525e6778e339122827c7cd79b8 (diff) | |
| download | talos-op-linux-d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b.tar.gz talos-op-linux-d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b.zip | |
Merge head 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/iosapic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ia64/iosapic.h b/include/asm-ia64/iosapic.h index 1093f35b3b90..a429fe225b07 100644 --- a/include/asm-ia64/iosapic.h +++ b/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) |
