diff options
author | Tony Luck <tony.luck@intel.com> | 2007-07-20 19:14:28 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2007-07-25 16:08:41 -0400 |
commit | cb2e0912f714b116812ef5834b5ba80d894ac967 (patch) | |
tree | b3153a18678aee76353c10e5a03e2cab6ca39003 /arch | |
parent | 9d6f40b86b47928ffde8a41cb2ef332da34b3de2 (diff) |
[IA64] Nail two more simple section mismatch errors
pcibios_setup (between 'pci_setup' and 'quirk_mellanox_tavor')
setup_profiling_timer (between 'write_profile' and 'delayed_put_task_struct')
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/kernel/smp.c | 2 | ||||
-rw-r--r-- | arch/ia64/pci/pci.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c index 9f72838db26e..0982882bfb80 100644 --- a/arch/ia64/kernel/smp.c +++ b/arch/ia64/kernel/smp.c | |||
@@ -468,7 +468,7 @@ smp_send_stop (void) | |||
468 | send_IPI_allbutself(IPI_CPU_STOP); | 468 | send_IPI_allbutself(IPI_CPU_STOP); |
469 | } | 469 | } |
470 | 470 | ||
471 | int __init | 471 | int |
472 | setup_profiling_timer (unsigned int multiplier) | 472 | setup_profiling_timer (unsigned int multiplier) |
473 | { | 473 | { |
474 | return -EINVAL; | 474 | return -EINVAL; |
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 07d0e92742c8..488e48a5deea 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
@@ -581,7 +581,7 @@ pcibios_align_resource (void *data, struct resource *res, | |||
581 | /* | 581 | /* |
582 | * PCI BIOS setup, always defaults to SAL interface | 582 | * PCI BIOS setup, always defaults to SAL interface |
583 | */ | 583 | */ |
584 | char * __init | 584 | char * __devinit |
585 | pcibios_setup (char *str) | 585 | pcibios_setup (char *str) |
586 | { | 586 | { |
587 | return str; | 587 | return str; |