Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=cb2e0912f714b116812ef5834b5ba80d894ac967 Commit: cb2e0912f714b116812ef5834b5ba80d894ac967 Parent: 9d6f40b86b47928ffde8a41cb2ef332da34b3de2 Author: Tony Luck <[EMAIL PROTECTED]> AuthorDate: Fri Jul 20 16:14:28 2007 -0700 Committer: Tony Luck <[EMAIL PROTECTED]> CommitDate: Wed Jul 25 13:08:41 2007 -0700
[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 <[EMAIL PROTECTED]> --- arch/ia64/kernel/smp.c | 2 +- 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 9f72838..0982882 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 07d0e92..488e48a 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; - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html