diff --git a/[refs] b/[refs]
index ba5af10fe94e..3750584fd585 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9453e84d1765d2a532c2ba26ab2a5c3c9b8867c4
+refs/heads/master: 91a548d57e9c95bb47b66d9d3ac0bf381619a6e7
diff --git a/trunk/arch/mips/Kbuild.platforms b/trunk/arch/mips/Kbuild.platforms
index 8985487b3def..6f007c30bfb8 100644
--- a/trunk/arch/mips/Kbuild.platforms
+++ b/trunk/arch/mips/Kbuild.platforms
@@ -14,6 +14,7 @@ platforms += loongson
 platforms += mipssim
 platforms += mti-malta
 platforms += pmc-sierra
+platforms += pnx833x
 platforms += powertv
 platforms += rb532
 platforms += sgi-ip22
diff --git a/trunk/arch/mips/Makefile b/trunk/arch/mips/Makefile
index 4ba8070ef4f2..17f93314b94e 100644
--- a/trunk/arch/mips/Makefile
+++ b/trunk/arch/mips/Makefile
@@ -191,14 +191,6 @@ endif
 #
 include $(srctree)/arch/mips/Kbuild.platforms
 
-# NXP STB225
-core-$(CONFIG_SOC_PNX833X)		+= arch/mips/pnx833x/common/
-cflags-$(CONFIG_SOC_PNX833X)	+= -Iarch/mips/include/asm/mach-pnx833x
-core-$(CONFIG_NXP_STB220)		+= arch/mips/pnx833x/stb22x/
-load-$(CONFIG_NXP_STB220)		+= 0xffffffff80001000
-core-$(CONFIG_NXP_STB225)		+= arch/mips/pnx833x/stb22x/
-load-$(CONFIG_NXP_STB225)		+= 0xffffffff80001000
-
 #
 # Common NXP PNX8550
 #
diff --git a/trunk/arch/mips/pnx833x/Makefile b/trunk/arch/mips/pnx833x/Makefile
new file mode 100644
index 000000000000..02c4698cab05
--- /dev/null
+++ b/trunk/arch/mips/pnx833x/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_SOC_PNX833X)	+= common/
+obj-$(CONFIG_NXP_STB220)	+= stb22x/
+obj-$(CONFIG_NXP_STB225)	+= stb22x/
diff --git a/trunk/arch/mips/pnx833x/Platform b/trunk/arch/mips/pnx833x/Platform
new file mode 100644
index 000000000000..7e6ec4dbc8dd
--- /dev/null
+++ b/trunk/arch/mips/pnx833x/Platform
@@ -0,0 +1,5 @@
+# NXP STB225
+platform-$(CONFIG_SOC_PNX833X)	+= pnx833x/
+cflags-$(CONFIG_SOC_PNX833X)    += -Iarch/mips/include/asm/mach-pnx833x
+load-$(CONFIG_NXP_STB220)	+= 0xffffffff80001000
+load-$(CONFIG_NXP_STB225)	+= 0xffffffff80001000
diff --git a/trunk/arch/mips/pnx833x/common/Makefile b/trunk/arch/mips/pnx833x/common/Makefile
index 4a16f3b503b5..1a46dd291b16 100644
--- a/trunk/arch/mips/pnx833x/common/Makefile
+++ b/trunk/arch/mips/pnx833x/common/Makefile
@@ -1,3 +1 @@
 obj-y := interrupts.o platform.o prom.o setup.o reset.o
-
-EXTRA_CFLAGS += -Werror
diff --git a/trunk/arch/mips/pnx833x/stb22x/Makefile b/trunk/arch/mips/pnx833x/stb22x/Makefile
index 0c4df9f22098..7b580060de50 100644
--- a/trunk/arch/mips/pnx833x/stb22x/Makefile
+++ b/trunk/arch/mips/pnx833x/stb22x/Makefile
@@ -1,3 +1 @@
 obj-y := board.o
-
-EXTRA_CFLAGS += -Werror