summaryrefslogtreecommitdiffstats
path: root/arch/mips/txx9/rbtx4927/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-08-12 21:38:56 +0200
committerIngo Molnar <mingo@elte.hu>2010-08-12 21:39:04 +0200
commitf46a6804135795f77d096ab0128f27531c7d051c (patch)
tree7cd33f69e3661327739ae4c96e5a8389e7fc912e /arch/mips/txx9/rbtx4927/Makefile
parentb3e84ffa21f916e3354a12a7f19169c9febe96d0 (diff)
parentad41a1e0cab07c5125456e8d38e5b1ab148d04aa (diff)
downloadop-kernel-dev-f46a6804135795f77d096ab0128f27531c7d051c.zip
op-kernel-dev-f46a6804135795f77d096ab0128f27531c7d051c.tar.gz
Merge branch 'linus' into perf/urgent
Merge reason: Fix upstream breakage introduced by: de5d9bf: Move list types from <linux/list.h> to <linux/types.h>. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/txx9/rbtx4927/Makefile')
-rw-r--r--arch/mips/txx9/rbtx4927/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/txx9/rbtx4927/Makefile b/arch/mips/txx9/rbtx4927/Makefile
index f3e1f59..60b24c8 100644
--- a/arch/mips/txx9/rbtx4927/Makefile
+++ b/arch/mips/txx9/rbtx4927/Makefile
@@ -1,3 +1 @@
obj-y += prom.o setup.o irq.o
-
-EXTRA_CFLAGS += -Werror
OpenPOWER on IntegriCloud