From d8a84f597263aea79b615b7660461d6e1166754d Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Fri, 6 May 2011 15:00:09 -0700
Subject: [PATCH] --- yaml --- r: 245647 b: refs/heads/master c:
 8fab6af2156c0100f953fd61f4e0b2f82c9776dc h: refs/heads/master i:   245645:
 8c30998b28d001f184ced0aec67b97e10a7bef0d   245643:
 8ac0edf10ebabf6b1b99c4341cafe696f022e053   245639:
 ce3f14b4492069c41b6e22969621e9d2950d654e   245631:
 cc41f4ee29c8f71b64db3a24670a86cc3726acf1 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/platform/mrst/mrst.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 29868ae9d1fa..9388a5a405c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cb1f43ce8c72ee453c00fcb9f6ee9c4ebd03f98
+refs/heads/master: 8fab6af2156c0100f953fd61f4e0b2f82c9776dc
diff --git a/trunk/arch/x86/platform/mrst/mrst.c b/trunk/arch/x86/platform/mrst/mrst.c
index 275dbc19e2cf..7000e74b3087 100644
--- a/trunk/arch/x86/platform/mrst/mrst.c
+++ b/trunk/arch/x86/platform/mrst/mrst.c
@@ -194,7 +194,7 @@ static unsigned long __init mrst_calibrate_tsc(void)
 	return 0;
 }
 
-void __init mrst_time_init(void)
+static void __init mrst_time_init(void)
 {
 	sfi_table_parse(SFI_SIG_MTMR, NULL, NULL, sfi_parse_mtmr);
 	switch (mrst_timer_options) {
@@ -216,7 +216,7 @@ void __init mrst_time_init(void)
 	apbt_time_init();
 }
 
-void __cpuinit mrst_arch_setup(void)
+static void __cpuinit mrst_arch_setup(void)
 {
 	if (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 0x27)
 		__mrst_cpu_chip = MRST_CPU_CHIP_PENWELL;