diff options
| author | Tony Luck <tony.luck@intel.com> | 2007-07-20 16:14:28 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-07-25 13:08:41 -0700 |
| commit | cb2e0912f714b116812ef5834b5ba80d894ac967 (patch) | |
| tree | b3153a18678aee76353c10e5a03e2cab6ca39003 /arch/ia64 | |
| parent | 9d6f40b86b47928ffde8a41cb2ef332da34b3de2 (diff) | |
| download | linux-stable-cb2e0912f714b116812ef5834b5ba80d894ac967.tar.gz linux-stable-cb2e0912f714b116812ef5834b5ba80d894ac967.tar.bz2 linux-stable-cb2e0912f714b116812ef5834b5ba80d894ac967.zip | |
[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/ia64')
| -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) send_IPI_allbutself(IPI_CPU_STOP); } -int __init +int setup_profiling_timer (unsigned int multiplier) { 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, /* * PCI BIOS setup, always defaults to SAL interface */ -char * __init +char * __devinit pcibios_setup (char *str) { return str; |