From be379a341bf057b733ff9e6723d683097bc1f054 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 5 Aug 2010 13:25:48 +0100
Subject: [PATCH] --- yaml --- r: 204499 b: refs/heads/master c:
 1505b60757694512b76edce8ecc6f73b4a8a7f9f h: refs/heads/master i:   204497:
 a715d12acd285c65bfc1c8aa1789a39163d9913c   204495:
 37bc6f8a8a62433a545474986e6634a361629e9a v: v3

---
 [refs]                           | 2 +-
 trunk/arch/mips/Kbuild.platforms | 1 +
 trunk/arch/mips/Makefile         | 7 -------
 trunk/arch/mips/jazz/Makefile    | 2 --
 trunk/arch/mips/jazz/Platform    | 6 ++++++
 5 files changed, 8 insertions(+), 10 deletions(-)
 create mode 100644 trunk/arch/mips/jazz/Platform

diff --git a/[refs] b/[refs]
index 6c0fab1260f2..e49b99d6482d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82baa6b0829b810329dd72a31cd5721cba05488a
+refs/heads/master: 1505b60757694512b76edce8ecc6f73b4a8a7f9f
diff --git a/trunk/arch/mips/Kbuild.platforms b/trunk/arch/mips/Kbuild.platforms
index c074ee2455b0..7973bb085496 100644
--- a/trunk/arch/mips/Kbuild.platforms
+++ b/trunk/arch/mips/Kbuild.platforms
@@ -3,6 +3,7 @@
 platforms += alchemy
 platforms += ar7
 platforms += cobalt
+platforms += jazz
 platforms += loongson
 platforms += mipssim
 platforms += pmc-sierra
diff --git a/trunk/arch/mips/Makefile b/trunk/arch/mips/Makefile
index e83a88d62868..f714c8513515 100644
--- a/trunk/arch/mips/Makefile
+++ b/trunk/arch/mips/Makefile
@@ -191,13 +191,6 @@ endif
 #
 include $(srctree)/arch/mips/Kbuild.platforms
 
-#
-# Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
-#
-core-$(CONFIG_MACH_JAZZ)	+= arch/mips/jazz/
-cflags-$(CONFIG_MACH_JAZZ)	+= -I$(srctree)/arch/mips/include/asm/mach-jazz
-load-$(CONFIG_MACH_JAZZ)	+= 0xffffffff80080000
-
 #
 # DECstation family
 #
diff --git a/trunk/arch/mips/jazz/Makefile b/trunk/arch/mips/jazz/Makefile
index 5aee0c266d18..dd9d99bfcf7a 100644
--- a/trunk/arch/mips/jazz/Makefile
+++ b/trunk/arch/mips/jazz/Makefile
@@ -3,5 +3,3 @@
 #
 
 obj-y	 	:= irq.o jazzdma.o reset.o setup.o
-
-EXTRA_CFLAGS += -Werror
diff --git a/trunk/arch/mips/jazz/Platform b/trunk/arch/mips/jazz/Platform
new file mode 100644
index 000000000000..3373788acca1
--- /dev/null
+++ b/trunk/arch/mips/jazz/Platform
@@ -0,0 +1,6 @@
+#
+# Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
+#
+platform-$(CONFIG_MACH_JAZZ)	+= jazz/
+cflags-$(CONFIG_MACH_JAZZ)	+= -I$(srctree)/arch/mips/include/asm/mach-jazz
+load-$(CONFIG_MACH_JAZZ)	+= 0xffffffff80080000