From d003c0ba72d949a780f48457d35ceddb837977df Mon Sep 17 00:00:00 2001
From: Jaswinder Singh Rajput <jaswinder@infradead.org>
Date: Mon, 29 Dec 2008 21:44:12 +0530
Subject: [PATCH] --- yaml --- r: 125407 b: refs/heads/master c:
 412a1be265b894a45cebbfc2b57eb7a593bf34b2 h: refs/heads/master i:   125405:
 52458add7b58b5216cebd7d60fd6cbb05ff85bd6   125403:
 a18ead19ca45beec81c3e206952b1fe97b03dab0   125399:
 94853436e0a89b084809ecda87832b4c09f9a82a   125391:
 d909059be62fcbd0083c8c7ba0fd771d158209d0   125375:
 ba54daf08996891bea0604cf8dc17193ade1a083 v: v3

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

diff --git a/[refs] b/[refs]
index 7a1941b2b282..4ae727ad0aab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 824877111cd7f2b4fd2fe6947c5c5cbbb3ac5bd8
+refs/heads/master: 412a1be265b894a45cebbfc2b57eb7a593bf34b2
diff --git a/trunk/arch/x86/kernel/amd_iommu_init.c b/trunk/arch/x86/kernel/amd_iommu_init.c
index c625800c55ca..fb85e8d466cc 100644
--- a/trunk/arch/x86/kernel/amd_iommu_init.c
+++ b/trunk/arch/x86/kernel/amd_iommu_init.c
@@ -243,7 +243,7 @@ static void __init iommu_feature_disable(struct amd_iommu *iommu, u8 bit)
 }
 
 /* Function to enable the hardware */
-void __init iommu_enable(struct amd_iommu *iommu)
+static void __init iommu_enable(struct amd_iommu *iommu)
 {
 	printk(KERN_INFO "AMD IOMMU: Enabling IOMMU "
 	       "at %02x:%02x.%x cap 0x%hx\n",
@@ -256,7 +256,7 @@ void __init iommu_enable(struct amd_iommu *iommu)
 }
 
 /* Function to enable IOMMU event logging and event interrupts */
-void __init iommu_enable_event_logging(struct amd_iommu *iommu)
+static void __init iommu_enable_event_logging(struct amd_iommu *iommu)
 {
 	iommu_feature_enable(iommu, CONTROL_EVT_LOG_EN);
 	iommu_feature_enable(iommu, CONTROL_EVT_INT_EN);