diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-11 04:30:27 (GMT) |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-11 04:30:27 (GMT) |
| commit | cfad589f565bdaa69d45fb1c0db124727a6eaf6e (patch) | |
| tree | 0582935064aa9e6ba0c80efaf6c0ef35ff8c3867 /include | |
| parent | bc625f20c08c5a5438a9fa3bb6d67fd84b1bab4b (diff) | |
| parent | 437105f2a7f23899fd647e7ada683ba8dacf11ba (diff) | |
| download | linux-cfad589f565bdaa69d45fb1c0db124727a6eaf6e.tar.xz | |
Merge branch 'linux-2.6' into for-2.6.25
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/iosapic.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-ia64/iosapic.h b/include/asm-ia64/iosapic.h index b8f7128..a3a4288 100644 --- a/include/asm-ia64/iosapic.h +++ b/include/asm-ia64/iosapic.h @@ -80,7 +80,6 @@ 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); extern int iosapic_register_intr (unsigned int gsi, unsigned long polarity, unsigned long trigger); @@ -94,7 +93,6 @@ extern int __init iosapic_register_platform_intr (u32 int_type, u16 eid, u16 id, unsigned long polarity, unsigned long trigger); -extern unsigned int iosapic_version (char __iomem *addr); #ifdef CONFIG_NUMA extern void __devinit map_iosapic_to_node (unsigned int, int); |