From dee5b1680a92618c36153030cb202e15a3c3af8b Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Thu, 29 Oct 2009 20:59:57 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/patches/debian/arch-mips-not-embedded.patch: Add. * debian/patches/series/base: Add new patch. svn path=/dists/trunk/linux-2.6/; revision=14508 --- debian/changelog | 4 ++++ debian/patches/debian/arch-mips-not-embedded.patch | 13 +++++++++++++ debian/patches/series/base | 1 + 3 files changed, 18 insertions(+) create mode 100644 debian/patches/debian/arch-mips-not-embedded.patch diff --git a/debian/changelog b/debian/changelog index be9b95e53..1a0a4f54d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Mon, 26 Oct 2009 01:18:26 +0000 linux-2.6 (2.6.31-1) unstable; urgency=low diff --git a/debian/patches/debian/arch-mips-not-embedded.patch b/debian/patches/debian/arch-mips-not-embedded.patch new file mode 100644 index 000000000..3d515b36f --- /dev/null +++ b/debian/patches/debian/arch-mips-not-embedded.patch @@ -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" diff --git a/debian/patches/series/base b/debian/patches/series/base index 52d895cd8..4f80f9a65 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -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