[PATCH] sh: consolidate hp620/hp680/hp690 targets into hp6xx

Most of the reasons for keeping these separate before was due to hp690
discontig, and since we have a workaround for that now (abusing some shadow
space so everything is magically contiguous), there's no reason to keep the
targets separate.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 1 insertions, 4 deletions

diff --git a/arch/sh/tools/mach-types b/arch/sh/tools/mach-types
index 0693fbd1f956..182fe9092577 100644
--- a/arch/sh/tools/mach-types
+++ b/arch/sh/tools/mach-types
@@ -10,10 +10,7 @@ SE			SH_SOLUTION_ENGINE
 7300SE                  SH_7300_SOLUTION_ENGINE
 73180SE                 SH_73180_SOLUTION_ENGINE
 7751SYSTEMH             SH_7751_SYSTEMH
-HP600                   SH_HP600
-HP620                   SH_HP620
-HP680                   SH_HP680
-HP690                   SH_HP690
+HP6XX                   SH_HP6XX
 HD64461                 HD64461
 HD64465                 HD64465
 SH2000                  SH_SH2000