[kernel] r15206 - in dists/trunk/linux-2.6/debian/patches: bugfix/mips series

[Ben Hutchings]

Author: benh
Date: Fri Feb 19 02:00:53 2010
New Revision: 15206

Log:
Fix up bugfix/mips/disable-werror.patch for 2.6.33-rc8

Modified:
   dists/trunk/linux-2.6/debian/patches/bugfix/mips/disable-werror.patch
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/mips/disable-werror.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/mips/disable-werror.patch	Fri Feb 19 00:44:35 2010	(r15205)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/mips/disable-werror.patch	Fri Feb 19 02:00:53 2010	(r15206)
@@ -8,8 +8,10 @@
 
 --- a/arch/mips/kernel/Makefile	2009-02-16 11:25:13.000000000 +0000
 +++ b/arch/mips/kernel/Makefile	2009-02-16 11:25:23.000000000 +0000
-@@ -89,4 +89,3 @@
+@@ -100,6 +100,5 @@
  
- obj-$(CONFIG_HAVE_STD_PC_SERIAL_PORT)	+= 8250-platform.o
+ obj-$(CONFIG_MIPS_CPUFREQ)	+= cpufreq/
  
 -EXTRA_CFLAGS += -Werror
+ 
+ CPPFLAGS_vmlinux.lds		:= $(KBUILD_CFLAGS)

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Fri Feb 19 00:44:35 2010	(r15205)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Fri Feb 19 02:00:53 2010	(r15206)
@@ -33,8 +33,7 @@
 #+ bugfix/ia64/hardcode-arch-script-output.patch
 + bugfix/mips/disable-advansys.patch
 + bugfix/arm/disable-scsi_acard.patch
-# FIXME: no longer applies
-#+ bugfix/mips/disable-werror.patch
++ bugfix/mips/disable-werror.patch
 + bugfix/fix-hifn_795X-divdi3.patch
 + bugfix/powerpc/mm-mol.patch
 + bugfix/powerpc/lpar-console.patch