diff --git a/[refs] b/[refs]
index 34e9912548a0..720e2a374b5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f44668c88dd056a590696787e7203a2ef8a5c83
+refs/heads/master: de7566bff359bbd7f6a4a37b4b5ce93225067786
diff --git a/trunk/arch/powerpc/boot/dts/adder875-redboot.dts b/trunk/arch/powerpc/boot/dts/adder875-redboot.dts
index 8f7a79ffa3bf..930bfb3894eb 100644
--- a/trunk/arch/powerpc/boot/dts/adder875-redboot.dts
+++ b/trunk/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/trunk/arch/powerpc/boot/dts/adder875-uboot.dts b/trunk/arch/powerpc/boot/dts/adder875-uboot.dts
index 60d4ad5a86d9..0197242dacfb 100644
--- a/trunk/arch/powerpc/boot/dts/adder875-uboot.dts
+++ b/trunk/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/trunk/arch/powerpc/platforms/8xx/adder875.c b/trunk/arch/powerpc/platforms/8xx/adder875.c
index af040fd2dcc6..c6bc0783c3b0 100644
--- a/trunk/arch/powerpc/platforms/8xx/adder875.c
+++ b/trunk/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", },
 	{},
 };