4 files changed, 12 insertions, 14 deletions

diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
index 0ba692c1017a..e391b6d473e3 100644
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -9,6 +9,7 @@ platforms += loongson
 platforms += mipssim
 platforms += pmc-sierra
 platforms += sgi-ip27
+platforms += sni
 platforms += vr41xx
 
 # include the platform specific files
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index efaae8578ee7..ccbb367b5bf1 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -370,18 +370,6 @@ cflags-$(CONFIG_BCM63XX)	+= -I$(srctree)/arch/mips/include/asm/mach-bcm63xx/
 load-$(CONFIG_BCM63XX)          := 0xffffffff80010000
 
 #
-# SNI RM
-#
-core-$(CONFIG_SNI_RM)           += arch/mips/sni/
-cflags-$(CONFIG_SNI_RM)         += -I$(srctree)/arch/mips/include/asm/mach-rm
-ifdef CONFIG_CPU_LITTLE_ENDIAN
-load-$(CONFIG_SNI_RM)           += 0xffffffff80600000
-else
-load-$(CONFIG_SNI_RM)           += 0xffffffff80030000
-endif
-all-$(CONFIG_SNI_RM)            := $(COMPRESSION_FNAME).ecoff
-
-#
 # Common TXx9
 #
 core-$(CONFIG_MACH_TX39XX)      += arch/mips/txx9/generic/
diff --git a/arch/mips/sni/Makefile b/arch/mips/sni/Makefile
index a7dbeebe7fe6..9d3bad3200ce 100644
--- a/arch/mips/sni/Makefile
+++ b/arch/mips/sni/Makefile
@@ -4,5 +4,3 @@
 
 obj-y += irq.o reset.o setup.o a20r.o rm200.o pcimt.o pcit.o time.o
 obj-$(CONFIG_EISA) += eisa.o
-
-EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/sni/Platform b/arch/mips/sni/Platform
new file mode 100644
index 000000000000..2644a9d63c0f
--- /dev/null
+++ b/arch/mips/sni/Platform
@@ -0,0 +1,11 @@
+#
+# SNI RM
+#
+platform-$(CONFIG_SNI_RM)               += sni/
+cflags-$(CONFIG_SNI_RM)         += -I$(srctree)/arch/mips/include/asm/mach-rm
+ifdef CONFIG_CPU_LITTLE_ENDIAN
+load-$(CONFIG_SNI_RM)           += 0xffffffff80600000
+else
+load-$(CONFIG_SNI_RM)           += 0xffffffff80030000
+endif
+all-$(CONFIG_SNI_RM)            := $(COMPRESSION_FNAME).ecoff