debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Frederik Schüler 2006-05-12 11:52:43 +00:00
parent 8ad48bf454
commit 9529704be4
7 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/arch/alpha/config vendored
View File

@ -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

2
debian/arch/config vendored
View File

@ -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

2
debian/arch/hppa/config vendored
View File

@ -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

2
debian/arch/i386/config vendored
View File

@ -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

6
debian/changelog vendored
View File

@ -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 <fs@debian.org> 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 ]

28
debian/patches/s390-drivers-qeth.patch vendored
View File

@ -1,28 +0,0 @@
From: Bastian Blank <bastian@waldi.eu.org>
Signed-off-by: Bastian Blank <bastian@waldi.eu.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Garzik <jeff@garzik.org>
Acked-by: Frank Pavlic <fpavlic@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
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,
_

1
debian/patches/series/0experimental.1 vendored
View File

@ -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