[MTD] [NAND] remove __PPC__ hardcoded address from DiskOnChip drivers

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=f63af11ddb508ce7b2a270515244d145248cad7f
Commit:     f63af11ddb508ce7b2a270515244d145248cad7f
Parent:     6f40470e745693ee4ad85edb441b0aad5cae3f00
Author:     Milton Miller <miltonm at bga.com>
AuthorDate: Thu Jul 10 16:14:18 2008 -0500
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Fri Jul 11 18:21:54 2008 +0100

    [MTD] [NAND] remove __PPC__ hardcoded address from DiskOnChip drivers
    
    Such a hardcoded address can cause a checkstop or machine check if
    the driver is in the kernel but the address is not acknowledged.
    
    Both drivers allow an address to be specified as either a module
    parameter or config option.   Any future powerpc board should either
    use one of these methods or find the address in the device tree.
    
    Signed-off-by: Milton Miller <miltonm at bga.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/devices/docprobe.c |    2 --
 drivers/mtd/nand/diskonchip.c  |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/devices/docprobe.c b/drivers/mtd/devices/docprobe.c
index 6e5d811..6e62922 100644
--- a/drivers/mtd/devices/docprobe.c
+++ b/drivers/mtd/devices/docprobe.c
@@ -76,8 +76,6 @@ static unsigned long __initdata doc_locations[] = {
 	0xe0000, 0xe2000, 0xe4000, 0xe6000,
 	0xe8000, 0xea000, 0xec000, 0xee000,
 #endif /*  CONFIG_MTD_DOCPROBE_HIGH */
-#elif defined(__PPC__)
-	0xe4000000,
 #else
 #warning Unknown architecture for DiskOnChip. No default probe locations defined
 #endif
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index cd4393c..765d4f0 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -52,8 +52,6 @@ static unsigned long __initdata doc_locations[] = {
 	0xe0000, 0xe2000, 0xe4000, 0xe6000,
 	0xe8000, 0xea000, 0xec000, 0xee000,
 #endif /*  CONFIG_MTD_DOCPROBE_HIGH */
-#elif defined(__PPC__)
-	0xe4000000,
 #else
 #warning Unknown architecture for DiskOnChip. No default probe locations defined
 #endif