Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=de7566...
Commit: de7566bff359bbd7f6a4a37b4b5ce93225067786
Parent: 5f44668c88dd056a590696787e7203a2ef8a5c83
Author: Scott Wood <scottwood@freescale.com>
AuthorDate: Tue Jan 22 12:31:41 2008 -0600
Committer: Kumar Gala <galak@kernel.crashing.org>
CommitDate: Wed Jan 23 19:34:56 2008 -0600
[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>
---
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", },
{},
};
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
