diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
index 77e48b9bddedb327e43c089eacc4bf0620ed41c0..6c163c278222b2cd110d7a991c14f2c1b1c689a9 100644
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -2,6 +2,7 @@
 
 platforms += alchemy
 platforms += ar7
+platforms += cobalt
 platforms += loongson
 platforms += mipssim
 platforms += sgi-ip27
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index ec2cd73a2b709ede191856b9c6fa8bc9f7d29b39..01fbd91a52c8baa17ffe83f2cc8609fb9680b053 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -198,13 +198,6 @@ core-$(CONFIG_MACH_JAZZ)	+= arch/mips/jazz/
 cflags-$(CONFIG_MACH_JAZZ)	+= -I$(srctree)/arch/mips/include/asm/mach-jazz
 load-$(CONFIG_MACH_JAZZ)	+= 0xffffffff80080000
 
-#
-# Cobalt Server
-#
-core-$(CONFIG_MIPS_COBALT)	+= arch/mips/cobalt/
-cflags-$(CONFIG_MIPS_COBALT)	+= -I$(srctree)/arch/mips/include/asm/mach-cobalt
-load-$(CONFIG_MIPS_COBALT)	+= 0xffffffff80080000
-
 #
 # DECstation family
 #
diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile
index 237926288d6d57ff5fb15feebeadda3a0cedf505..61a334ac43ac7c52565713e4a45ed882da57132d 100644
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@ -7,5 +7,3 @@ obj-y := buttons.o irq.o lcd.o led.o reset.o rtc.o serial.o setup.o time.o
 obj-$(CONFIG_PCI)		+= pci.o
 obj-$(CONFIG_EARLY_PRINTK)	+= console.o
 obj-$(CONFIG_MTD_PHYSMAP)	+= mtd.o
-
-EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/cobalt/Platform b/arch/mips/cobalt/Platform
new file mode 100644
index 0000000000000000000000000000000000000000..34123efd6dfeb6bd6af588632228d0fbb88b3840
--- /dev/null
+++ b/arch/mips/cobalt/Platform
@@ -0,0 +1,6 @@
+#
+# Cobalt Server
+#
+platform-$(CONFIG_MIPS_COBALT)	+= cobalt/
+cflags-$(CONFIG_MIPS_COBALT)	+= -I$(srctree)/arch/mips/include/asm/mach-cobalt
+load-$(CONFIG_MIPS_COBALT)	+= 0xffffffff80080000