summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2008-01-22 12:31:41 -0600
committerKumar Gala <galak@kernel.crashing.org>2008-01-23 19:34:56 -0600
commitde7566bff359bbd7f6a4a37b4b5ce93225067786 (patch)
tree7b061f4e7213b806dd7c8ff71a7d5a6ee64d3c11
parent5f44668c88dd056a590696787e7203a2ef8a5c83 (diff)
[POWERPC] 8xx: adder875 - Fix flash bus-width and remove duplicate __initdata
Signed-off-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--arch/powerpc/boot/dts/adder875-redboot.dts2
-rw-r--r--arch/powerpc/boot/dts/adder875-uboot.dts2
-rw-r--r--arch/powerpc/platforms/8xx/adder875.c2
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 8f7a79ffa3bf..930bfb3894eb 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 60d4ad5a86d9..0197242dacfb 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 af040fd2dcc6..c6bc0783c3b0 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", },
{},
};