From ccd176416380d828a02709e101ed8f7e801ddb5b Mon Sep 17 00:00:00 2001 From: Milton Miller Date: Thu, 10 Jul 2008 16:14:18 -0500 Subject: [PATCH] --- yaml --- r: 106440 b: refs/heads/master c: f63af11ddb508ce7b2a270515244d145248cad7f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/devices/docprobe.c | 2 -- trunk/drivers/mtd/nand/diskonchip.c | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 74333cd3591b..88818e511dc5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f40470e745693ee4ad85edb441b0aad5cae3f00 +refs/heads/master: f63af11ddb508ce7b2a270515244d145248cad7f diff --git a/trunk/drivers/mtd/devices/docprobe.c b/trunk/drivers/mtd/devices/docprobe.c index 6e5d811ae83a..6e62922942b1 100644 --- a/trunk/drivers/mtd/devices/docprobe.c +++ b/trunk/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/trunk/drivers/mtd/nand/diskonchip.c b/trunk/drivers/mtd/nand/diskonchip.c index cd4393ce2562..765d4f0f7c86 100644 --- a/trunk/drivers/mtd/nand/diskonchip.c +++ b/trunk/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