Subject: [PATCH] adder875: Fix flash bus-width and remove duplicate __initdata.

From: Scott Wood <[email-masked]>
Date: Tue, 22 Jan 2008 12:31:41 -0600

Signed-off-by: Scott Wood <[email-masked]>
---
 arch/powerpc/boot/dts/adder875-redboot.dts |    2 +-
 arch/powerpc/boot/dts/adder875-uboot.dts   |    2 +-
 arch/powerpc/platforms/8xx/adder875.c      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/boot/dts/adder875-redboot.dts b/arch/powerpc/boot/dts/adder875-redboot.dts
index 8f7a79f..930bfb3 100644
--- a/arch/powerpc/boot/dts/adder875-redboot.dts
+++ b/arch/powerpc/boot/dts/adder875-redboot.dts
@@ -62,7 +62,7 @@
 		flash@0,0 {
 			compatible = "cfi-flash";
 			reg = <0 0 0x800000>;
-			bank-width = <4>;
+			bank-width = <2>;
 			device-width = <2>;
 		};
 	};
diff --git a/arch/powerpc/boot/dts/adder875-uboot.dts b/arch/powerpc/boot/dts/adder875-uboot.dts
index 60d4ad5..0197242 100644
--- a/arch/powerpc/boot/dts/adder875-uboot.dts
+++ b/arch/powerpc/boot/dts/adder875-uboot.dts
@@ -61,7 +61,7 @@
 		flash@0,0 {
 			compatible = "cfi-flash";
 			reg = <0 0 0x800000>;
-			bank-width = <4>;
+			bank-width = <2>;
 			device-width = <2>;
 		};
 	};
diff --git a/arch/powerpc/platforms/8xx/adder875.c b/arch/powerpc/platforms/8xx/adder875.c
index af040fd..c6bc078 100644
--- a/arch/powerpc/platforms/8xx/adder875.c
+++ b/arch/powerpc/platforms/8xx/adder875.c
@@ -92,7 +92,7 @@ static int __init adder875_probe(void)
 	return of_flat_dt_is_compatible(root, "analogue-and-micro,adder875");
 }
 
-static __initdata struct of_device_id __initdata of_bus_ids[] = {
+static __initdata struct of_device_id of_bus_ids[] = {
 	{ .compatible = "simple-bus", },
 	{},
 };
-- 
1.5.3.8