From 9529704be4c4c21dde3f863f5273e1139a2110af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20Sch=C3=BCler?= Date: Fri, 12 May 2006 11:52:43 +0000 Subject: [PATCH] Update trunk to rc4. Make CONFIG_SND_PDAUDIOCF and CONFIG_SND_VXPOCKET global options. delete patches/s390-drivers-qeth.patch: merged upstream. svn path=/dists/trunk/linux-2.6/; revision=6561 --- debian/arch/alpha/config | 2 -- debian/arch/config | 2 ++ debian/arch/hppa/config | 2 -- debian/arch/i386/config | 2 -- debian/changelog | 6 ++++++ debian/patches/s390-drivers-qeth.patch | 28 -------------------------- debian/patches/series/0experimental.1 | 1 - 7 files changed, 8 insertions(+), 35 deletions(-) delete mode 100644 debian/patches/s390-drivers-qeth.patch diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index 80034d46a..5fd730051 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -1282,9 +1282,7 @@ CONFIG_SND_VX222=m CONFIG_SND_HDA_INTEL=m CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m -CONFIG_SND_VXPOCKET=m CONFIG_SND_VXP440=m -CONFIG_SND_PDAUDIOCF=m CONFIG_SOUND_PRIME=m CONFIG_SOUND_BT878=m CONFIG_SOUND_CMPCI=m diff --git a/debian/arch/config b/debian/arch/config index e0b1add71..98a1cc625 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -915,3 +915,5 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_MUTEXES is not set CONFIG_BCM43XX_DEBUG=y +CONFIG_SND_PDAUDIOCF=m +CONFIG_SND_VXPOCKET=m diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index 2c08024d7..cc3c17784 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -659,9 +659,7 @@ CONFIG_SND_AC97_CODEC=m # CONFIG_SND_VX222 is not set # CONFIG_SND_HDA_INTEL is not set # CONFIG_SND_USB_AUDIO is not set -# CONFIG_SND_VXPOCKET is not set # CONFIG_SND_VXP440 is not set -# CONFIG_SND_PDAUDIOCF is not set CONFIG_SND_HARMONY=m # CONFIG_SOUND_PRIME is not set CONFIG_USB_ARCH_HAS_HCD=y diff --git a/debian/arch/i386/config b/debian/arch/i386/config index 140a1bb21..7b8a7698d 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -1441,9 +1441,7 @@ CONFIG_SND_VX222=m CONFIG_SND_HDA_INTEL=m CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m -CONFIG_SND_VXPOCKET=m CONFIG_SND_VXP440=m -CONFIG_SND_PDAUDIOCF=m CONFIG_SOUND_PRIME=m CONFIG_SOUND_BT878=m CONFIG_SOUND_CMPCI=m diff --git a/debian/changelog b/debian/changelog index 907813201..5e77ee05c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux-2.6 (2.6.16+2.6.17-rc4-0experimental.1) experimental; urgency=low + + * New upstream release candidate. + + -- Frederik Schüler Fri, 12 May 2006 13:02:25 +0200 + linux-2.6 (2.6.16+2.6.17-rc3-0experimental.1) experimental; urgency=low [ Frederik Schüler ] diff --git a/debian/patches/s390-drivers-qeth.patch b/debian/patches/s390-drivers-qeth.patch deleted file mode 100644 index 5a4cc9e33..000000000 --- a/debian/patches/s390-drivers-qeth.patch +++ /dev/null @@ -1,28 +0,0 @@ - -From: Bastian Blank - -Signed-off-by: Bastian Blank -Cc: Martin Schwidefsky -Cc: Heiko Carstens -Cc: "David S. Miller" -Cc: Jeff Garzik -Acked-by: Frank Pavlic -Signed-off-by: Andrew Morton ---- - - drivers/s390/net/qeth_main.c | 1 - - 1 files changed, 1 deletion(-) - -diff -puN drivers/s390/net/qeth_main.c~s390-make-qeth-buildable drivers/s390/net/qeth_main.c ---- devel/drivers/s390/net/qeth_main.c~s390-make-qeth-buildable 2006-05-01 12:15:28.000000000 -0700 -+++ devel-akpm/drivers/s390/net/qeth_main.c 2006-05-01 12:15:28.000000000 -0700 -@@ -8014,7 +8014,6 @@ static int (*qeth_old_arp_constructor) ( - - static struct neigh_ops arp_direct_ops_template = { - .family = AF_INET, -- .destructor = NULL, - .solicit = NULL, - .error_report = NULL, - .output = dev_queue_xmit, -_ - diff --git a/debian/patches/series/0experimental.1 b/debian/patches/series/0experimental.1 index 48616c4be..6d3fedc1f 100644 --- a/debian/patches/series/0experimental.1 +++ b/debian/patches/series/0experimental.1 @@ -24,4 +24,3 @@ + s390-drivers-ccw-uevent-cleanup.patch + mips-sb1-duart-tts.patch #FIXME + powerpc-mkvmlinuz-support-2.patch -+ s390-drivers-qeth.patch