From dfe4b5f4b405d8fa298acea2a3f05abeaf03825e Mon Sep 17 00:00:00 2001
From: Li Yang <leoli@freescale.com>
Date: Wed, 23 May 2007 11:28:03 +0800
Subject: [PATCH] --- yaml --- r: 57042 b: refs/heads/master c:
 405861a0429113f8e426092af09dd05ec6209410 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/powerpc/platforms/chrp/pegasos_eth.c | 2 +-
 trunk/arch/powerpc/platforms/powermac/setup.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f5d1ed44efc8..807507660049 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90c615bc42886f23a6112733a949d0f6fbe343b6
+refs/heads/master: 405861a0429113f8e426092af09dd05ec6209410
diff --git a/trunk/arch/powerpc/platforms/chrp/pegasos_eth.c b/trunk/arch/powerpc/platforms/chrp/pegasos_eth.c
index 71045677559a..5bcc58d9a4dd 100644
--- a/trunk/arch/powerpc/platforms/chrp/pegasos_eth.c
+++ b/trunk/arch/powerpc/platforms/chrp/pegasos_eth.c
@@ -169,7 +169,7 @@ static int Enable_SRAM(void)
 
 /***********/
 /***********/
-int mv643xx_eth_add_pds(void)
+static int __init mv643xx_eth_add_pds(void)
 {
 	int ret = 0;
 	static struct pci_device_id pci_marvell_mv64360[] = {
diff --git a/trunk/arch/powerpc/platforms/powermac/setup.c b/trunk/arch/powerpc/platforms/powermac/setup.c
index a410bc76a8a8..07b1c4ec428d 100644
--- a/trunk/arch/powerpc/platforms/powermac/setup.c
+++ b/trunk/arch/powerpc/platforms/powermac/setup.c
@@ -384,7 +384,7 @@ int boot_part;
 static dev_t boot_dev;
 
 #ifdef CONFIG_SCSI
-void __init note_scsi_host(struct device_node *node, void *host)
+void note_scsi_host(struct device_node *node, void *host)
 {
 	int l;
 	char *p;