From e4bd48571bf4f95619709b875a3a89d7d1203b6b Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Wed, 22 Mar 2006 17:49:41 +0000 Subject: [PATCH] Merge /dists/sid/linux-2.6. svn path=/dists/trunk/linux-2.6/; revision=6265 --- debian/arch/arm/config.ixp4xx | 1 + debian/arch/mips/config | 1 + debian/arch/mips/config.r4k-ip22 | 7 ------- debian/arch/mips/config.r5k-ip32 | 7 ------- debian/arch/mips/config.sb1-bcm91250a | 7 ------- debian/arch/mips/config.sb1a-bcm91480b | 7 ------- debian/arch/mipsel/config | 1 + debian/arch/mipsel/config.r5k-cobalt | 9 +-------- debian/arch/mipsel/config.sb1-bcm91250a | 7 ------- debian/arch/mipsel/config.sb1a-bcm91480b | 7 ------- debian/changelog | 14 ++++++++++++-- 11 files changed, 16 insertions(+), 52 deletions(-) diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index 61d5e11ba..e049e26ab 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -652,6 +652,7 @@ CONFIG_CICADA_PHY=m # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y +CONFIG_MACLIST=y CONFIG_MII=y # CONFIG_HAPPYMEAL is not set # CONFIG_SUNGEM is not set diff --git a/debian/arch/mips/config b/debian/arch/mips/config index e69de29bb..a1b333ca5 100644 --- a/debian/arch/mips/config +++ b/debian/arch/mips/config @@ -0,0 +1 @@ +CONFIG_MIPS=y diff --git a/debian/arch/mips/config.r4k-ip22 b/debian/arch/mips/config.r4k-ip22 index 8935f7bba..d12fd04e4 100644 --- a/debian/arch/mips/config.r4k-ip22 +++ b/debian/arch/mips/config.r4k-ip22 @@ -1,10 +1,3 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-rc5 -# Thu Mar 2 14:53:47 2006 -# -CONFIG_MIPS=y - # # Machine selection # diff --git a/debian/arch/mips/config.r5k-ip32 b/debian/arch/mips/config.r5k-ip32 index 4a0bd6309..4bc55ed4a 100644 --- a/debian/arch/mips/config.r5k-ip32 +++ b/debian/arch/mips/config.r5k-ip32 @@ -1,10 +1,3 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-rc5 -# Thu Mar 2 14:54:35 2006 -# -CONFIG_MIPS=y - # # Machine selection # diff --git a/debian/arch/mips/config.sb1-bcm91250a b/debian/arch/mips/config.sb1-bcm91250a index 0b02e75ef..ea3567c88 100644 --- a/debian/arch/mips/config.sb1-bcm91250a +++ b/debian/arch/mips/config.sb1-bcm91250a @@ -1,10 +1,3 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-rc5 -# Thu Mar 2 14:54:52 2006 -# -CONFIG_MIPS=y - # # Machine selection # diff --git a/debian/arch/mips/config.sb1a-bcm91480b b/debian/arch/mips/config.sb1a-bcm91480b index 9095a59da..15badc17d 100644 --- a/debian/arch/mips/config.sb1a-bcm91480b +++ b/debian/arch/mips/config.sb1a-bcm91480b @@ -1,10 +1,3 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-rc5 -# Thu Mar 2 14:54:52 2006 -# -CONFIG_MIPS=y - # # Machine selection # diff --git a/debian/arch/mipsel/config b/debian/arch/mipsel/config index e69de29bb..a1b333ca5 100644 --- a/debian/arch/mipsel/config +++ b/debian/arch/mipsel/config @@ -0,0 +1 @@ +CONFIG_MIPS=y diff --git a/debian/arch/mipsel/config.r5k-cobalt b/debian/arch/mipsel/config.r5k-cobalt index 0524de7e0..b722a7654 100644 --- a/debian/arch/mipsel/config.r5k-cobalt +++ b/debian/arch/mipsel/config.r5k-cobalt @@ -1,10 +1,3 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-rc5 -# Thu Mar 2 14:58:35 2006 -# -CONFIG_MIPS=y - # # Machine selection # @@ -236,7 +229,7 @@ CONFIG_NET=y # Networking options # # CONFIG_NETDEBUG is not set -CONFIG_PACKET=m +CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y diff --git a/debian/arch/mipsel/config.sb1-bcm91250a b/debian/arch/mipsel/config.sb1-bcm91250a index 07837fa9d..18f182a74 100644 --- a/debian/arch/mipsel/config.sb1-bcm91250a +++ b/debian/arch/mipsel/config.sb1-bcm91250a @@ -1,10 +1,3 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-rc5 -# Thu Mar 2 14:55:46 2006 -# -CONFIG_MIPS=y - # # Machine selection # diff --git a/debian/arch/mipsel/config.sb1a-bcm91480b b/debian/arch/mipsel/config.sb1a-bcm91480b index 3a07413e0..ac228384c 100644 --- a/debian/arch/mipsel/config.sb1a-bcm91480b +++ b/debian/arch/mipsel/config.sb1a-bcm91480b @@ -1,10 +1,3 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-rc5 -# Thu Mar 2 14:55:46 2006 -# -CONFIG_MIPS=y - # # Machine selection # diff --git a/debian/changelog b/debian/changelog index ae114d56a..f24cf9594 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,13 +4,23 @@ linux-2.6 (2.6.16-99experimental.1) UNRELEASED; urgency=low -- Bastian Blank Mon, 20 Mar 2006 12:33:49 +0100 -linux-2.6 (2.6.16-2) UNRELEASED; urgency=low +linux-2.6 (2.6.16-2) unstable; urgency=low + [ dann frazier ] * [ia64] Set unconfigured options: CONFIG_PNP_DEBUG=n and CONFIG_NET_SB1000=m * [hppa] Update config for 2.6.16 - -- dann frazier Tue, 21 Mar 2006 15:31:07 -0700 + [ Martin Michlmayr ] + * [mips/mipsel] Put something in the generic config file because diff + will otherwise remove the empty file, causing the build to fail. + * [mipsel/r5k-cobalt] Set CONFIG_PACKET=y. + * [arm] Set CONFIG_MACLIST=y for ixp4xx because nas100d needs it. + + [ Frederik Schüler ] + * Add Maximilian Attems to uploaders list. + + -- Martin Michlmayr Wed, 22 Mar 2006 15:15:14 +0000 linux-2.6 (2.6.16-1) unstable; urgency=low