From 90968fca01f639601c6d060d292845687de62179 Mon Sep 17 00:00:00 2001
From: Tony Luck <tony.luck@intel.com>
Date: Fri, 20 Jul 2007 16:14:28 -0700
Subject: [PATCH] --- yaml --- r: 62933 b: refs/heads/master c:
 cb2e0912f714b116812ef5834b5ba80d894ac967 h: refs/heads/master i:   62931:
 ffe00981a6a1531619705745b3e37c25c465b6c8 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/ia64/kernel/smp.c | 2 +-
 trunk/arch/ia64/pci/pci.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a2202efccf5a..818045748fdd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d6f40b86b47928ffde8a41cb2ef332da34b3de2
+refs/heads/master: cb2e0912f714b116812ef5834b5ba80d894ac967
diff --git a/trunk/arch/ia64/kernel/smp.c b/trunk/arch/ia64/kernel/smp.c
index 9f72838db26e..0982882bfb80 100644
--- a/trunk/arch/ia64/kernel/smp.c
+++ b/trunk/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/trunk/arch/ia64/pci/pci.c b/trunk/arch/ia64/pci/pci.c
index 07d0e92742c8..488e48a5deea 100644
--- a/trunk/arch/ia64/pci/pci.c
+++ b/trunk/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;