[kernel] r14508 - in dists/trunk/linux-2.6/debian: . patches/debian patches/series

[Bastian Blank]

Author: waldi
Date: Thu Oct 29 20:59:57 2009
New Revision: 14508

Log:
* debian/changelog: Update.
* debian/patches/debian/arch-mips-not-embedded.patch: Add.
* debian/patches/series/base: Add new patch.

Added:
   dists/trunk/linux-2.6/debian/patches/debian/arch-mips-not-embedded.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu Oct 29 20:57:06 2009	(r14507)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Oct 29 20:59:57 2009	(r14508)
@@ -1,9 +1,13 @@
 linux-2.6 (2.6.32~rc5-1) UNRELEASED; urgency=low
 
+  [ Ben Hutchings ]
   * New upstream release candidate.
   * README.Debian: Add brief information about building specific binary
     packages (Closes: #546182)
 
+  [ Bastian Blank ]
+  * [mips] Don't force EMBEDDED on.
+
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 26 Oct 2009 01:18:26 +0000
 
 linux-2.6 (2.6.31-1) unstable; urgency=low

Added: dists/trunk/linux-2.6/debian/patches/debian/arch-mips-not-embedded.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/arch-mips-not-embedded.patch	Thu Oct 29 20:59:57 2009	(r14508)
@@ -0,0 +1,13 @@
+diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
+index 705a7a9..290d999 100644
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -4,8 +4,6 @@ config MIPS
+ 	select HAVE_IDE
+ 	select HAVE_OPROFILE
+ 	select HAVE_ARCH_KGDB
+-	# Horrible source of confusion.  Die, die, die ...
+-	select EMBEDDED
+ 	select RTC_LIB if !LEMOTE_FULOONG2E
+ 
+ mainmenu "Linux/MIPS Kernel Configuration"

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Thu Oct 29 20:57:06 2009	(r14507)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Thu Oct 29 20:59:57 2009	(r14508)
@@ -2,6 +2,7 @@
 + debian/kernelvariables.patch
 + debian/doc-build-parallel.patch
 + debian/scripts-kconfig-reportoldconfig.patch
++ debian/arch-mips-not-embedded.patch
 
 + debian/drivers-ata-ata_piix-postpone-pata.patch
 + debian/drivers-ata-pata_sis-postpone-pata.patch