From b7b796743cfae888e41c96c5c3d3318ce9796e5d Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Tue, 11 Oct 2005 08:29:00 -0700
Subject: [PATCH] --- yaml --- r: 9801 b: refs/heads/master c:
 e4314bf496bb7bb9acd754aeb319c30869bc8d76 h: refs/heads/master i:   9799:
 9b839722499cf6af3f3ec950c4df19722e9ab94e v: v3

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

diff --git a/[refs] b/[refs]
index 20d8cc03f0a9..bd10f15e0cba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5945b4f605d1479d5b44252a2c691168c5d38d6
+refs/heads/master: e4314bf496bb7bb9acd754aeb319c30869bc8d76
diff --git a/trunk/arch/ppc64/kernel/pSeries_pci.c b/trunk/arch/ppc64/kernel/pSeries_pci.c
index 1f5f141fb7a1..928f8febdb3b 100644
--- a/trunk/arch/ppc64/kernel/pSeries_pci.c
+++ b/trunk/arch/ppc64/kernel/pSeries_pci.c
@@ -32,7 +32,7 @@
 
 #include "pci.h"
 
-static int __initdata s7a_workaround = -1;
+static int __devinitdata s7a_workaround = -1;
 
 #if 0
 void pcibios_name_device(struct pci_dev *dev)
@@ -60,7 +60,7 @@ void pcibios_name_device(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pcibios_name_device);
 #endif
 
-static void __init check_s7a(void)
+static void __devinit check_s7a(void)
 {
 	struct device_node *root;
 	char *model;