diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
index c074ee2455b0c482925602c9c65a22cf51b3d887..7973bb0854960250e6c0b655864497a47c3cb708 100644
--- a/arch/mips/Kbuild.platforms
+++ b/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/arch/mips/Makefile b/arch/mips/Makefile
index e83a88d6286879c50e3487f4042c47bcf52be6e3..f714c85135158fc617775cb4910171f704da5cde 100644
--- a/arch/mips/Makefile
+++ b/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/arch/mips/jazz/Makefile b/arch/mips/jazz/Makefile
index 5aee0c266d188654f12bffab7c5c9e0977c6829a..dd9d99bfcf7a2d5cf6535740f2a7cb1594aa2e58 100644
--- a/arch/mips/jazz/Makefile
+++ b/arch/mips/jazz/Makefile
@@ -3,5 +3,3 @@
 #
 
 obj-y	 	:= irq.o jazzdma.o reset.o setup.o
-
-EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/jazz/Platform b/arch/mips/jazz/Platform
new file mode 100644
index 0000000000000000000000000000000000000000..3373788acca12e0b7af34a5f04ce5ed7024a3f94
--- /dev/null
+++ b/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