From e9b7542906aabe20c5432933b062d9000f75ff98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Fri, 30 Mar 2012 10:05:00 +0000
Subject: [PATCH] --- yaml --- r: 298403 b: refs/heads/master c:
 059378e3ff36094dccdd55600c3ad67a88c302aa h: refs/heads/master i:   298401:
 75a5ebf74d5e60b7740cbf5441a3a6045945e8d7   298399:
 f714ff3a5bec401d5e764704fee0461fa2fe3e46 v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/powerpc/platforms/52xx/mpc52xx_pci.c | 2 +-
 trunk/arch/powerpc/platforms/cell/qpace_setup.c | 2 +-
 trunk/arch/powerpc/platforms/cell/setup.c       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f893f1ae56ab..48b808dc0110 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e31c6dfa8eb23ec7b3350b95ffe92f5a962d8c6b
+refs/heads/master: 059378e3ff36094dccdd55600c3ad67a88c302aa
diff --git a/trunk/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/trunk/arch/powerpc/platforms/52xx/mpc52xx_pci.c
index bfb11e01133e..e2d401ad8fbb 100644
--- a/trunk/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+++ b/trunk/arch/powerpc/platforms/52xx/mpc52xx_pci.c
@@ -93,7 +93,7 @@ struct mpc52xx_pci {
 };
 
 /* MPC5200 device tree match tables */
-const struct of_device_id mpc52xx_pci_ids[] __initdata = {
+const struct of_device_id mpc52xx_pci_ids[] __initconst = {
 	{ .type = "pci", .compatible = "fsl,mpc5200-pci", },
 	{ .type = "pci", .compatible = "mpc5200-pci", },
 	{}
diff --git a/trunk/arch/powerpc/platforms/cell/qpace_setup.c b/trunk/arch/powerpc/platforms/cell/qpace_setup.c
index 7f9b6742f8b6..6e3409d590ac 100644
--- a/trunk/arch/powerpc/platforms/cell/qpace_setup.c
+++ b/trunk/arch/powerpc/platforms/cell/qpace_setup.c
@@ -61,7 +61,7 @@ static void qpace_progress(char *s, unsigned short hex)
 	printk("*** %04x : %s\n", hex, s ? s : "");
 }
 
-static const struct of_device_id qpace_bus_ids[] __initdata = {
+static const struct of_device_id qpace_bus_ids[] __initconst = {
 	{ .type = "soc", },
 	{ .compatible = "soc", },
 	{ .type = "spider", },
diff --git a/trunk/arch/powerpc/platforms/cell/setup.c b/trunk/arch/powerpc/platforms/cell/setup.c
index fa3e294fd343..4ab087671185 100644
--- a/trunk/arch/powerpc/platforms/cell/setup.c
+++ b/trunk/arch/powerpc/platforms/cell/setup.c
@@ -140,7 +140,7 @@ static int __devinit cell_setup_phb(struct pci_controller *phb)
 	return 0;
 }
 
-static const struct of_device_id cell_bus_ids[] __initdata = {
+static const struct of_device_id cell_bus_ids[] __initconst = {
 	{ .type = "soc", },
 	{ .compatible = "soc", },
 	{ .type = "spider", },