diff options
| author | Jesse Barnes <jbarnes@sgi.com> | 2005-01-11 00:19:26 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-01-11 00:19:26 -0800 |
| commit | 62fec43e0da707f56335afafe5df033a156d06b2 (patch) | |
| tree | 12fd035e2df4532af38e6b4cdd0ad1f48889e9c5 /arch | |
| parent | 8492af96b15297e9fdb639b7a0d877cea53c99ab (diff) | |
| download | history-62fec43e0da707f56335afafe5df033a156d06b2.tar.gz | |
[IA64] pci.c: fix warning
Fix a 'mixing code and declarations' warning in pci.c by creating a small
function that's a no-op if CONFIG_NUMA=n but otherwise includes the proper
extern. Similar patch also submitted by <matthew@wil.cx>
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/pci/pci.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 260458f140adcb..c605170aaa5f81 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -132,6 +132,19 @@ struct pci_ops pci_root_ops = { .write = pci_write, }; +#ifdef CONFIG_NUMA +extern acpi_status acpi_map_iosapic(acpi_handle, u32, void *, void **); +static void acpi_map_iosapics(void) +{ + acpi_get_devices(NULL, acpi_map_iosapic, NULL, NULL); +} +#else +static void acpi_map_iosapics(void) +{ + return; +} +#endif /* CONFIG_NUMA */ + static int __init pci_acpi_init (void) { @@ -139,11 +152,7 @@ pci_acpi_init (void) printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n"); -#ifdef CONFIG_NUMA -extern acpi_status acpi_map_iosapic (acpi_handle, u32, void*, void**); - - acpi_get_devices(NULL, acpi_map_iosapic, NULL, NULL); -#endif + acpi_map_iosapics(); if (pci_routeirq) { /* |