From c40db49863c88b2b26981b8482dc9ab4ec56c852 Mon Sep 17 00:00:00 2001
From: Myron Stowe <myron.stowe@redhat.com>
Date: Mon, 25 Jun 2012 21:32:05 -0600
Subject: [PATCH] --- yaml --- r: 316526 b: refs/heads/master c:
 ce8dd71ad7cb9480d6003473630f0fbc4d67af71 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/sh/drivers/pci/fixups-sdk7786.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 440b53393384..8706b9e5191f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86927f9344ebfc1e4059eb774dbd975d50b7766b
+refs/heads/master: ce8dd71ad7cb9480d6003473630f0fbc4d67af71
diff --git a/trunk/arch/sh/drivers/pci/fixups-sdk7786.c b/trunk/arch/sh/drivers/pci/fixups-sdk7786.c
index 0e18ee332553..36eb6fc3c18a 100644
--- a/trunk/arch/sh/drivers/pci/fixups-sdk7786.c
+++ b/trunk/arch/sh/drivers/pci/fixups-sdk7786.c
@@ -23,9 +23,9 @@
  * Misconfigurations can be detected through the FPGA via the slot
  * resistors to determine card presence. Hotplug remains unsupported.
  */
-static unsigned int slot4en __devinitdata;
+static unsigned int slot4en __initdata;
 
-char *__devinit pcibios_setup(char *str)
+char *__init pcibios_setup(char *str)
 {
 	if (strcmp(str, "slot4en") == 0) {
 		slot4en = 1;