[kernel] r6561 - in dists/trunk/linux-2.6/debian: . arch arch/hppa arch/i386 patches patches/series

[Frederik Schüler]

Author: fs
Date: Fri May 12 11:52:43 2006
New Revision: 6561

Removed:
   dists/trunk/linux-2.6/debian/patches/s390-drivers-qeth.patch
Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/hppa/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/0experimental.1

Log:
Update trunk to rc4.
Make CONFIG_SND_PDAUDIOCF and CONFIG_SND_VXPOCKET global options.
delete patches/s390-drivers-qeth.patch: merged upstream.


Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config	Fri May 12 11:52:43 2006
@@ -1282,9 +1282,7 @@
 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

Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Fri May 12 11:52:43 2006
@@ -915,3 +915,5 @@
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_MUTEXES is not set
 CONFIG_BCM43XX_DEBUG=y
+CONFIG_SND_PDAUDIOCF=m
+CONFIG_SND_VXPOCKET=m

Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config	Fri May 12 11:52:43 2006
@@ -659,9 +659,7 @@
 # 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

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	Fri May 12 11:52:43 2006
@@ -1441,9 +1441,7 @@
 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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri May 12 11:52:43 2006
@@ -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 at 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 ]

Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/0experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/0experimental.1	Fri May 12 11:52:43 2006
@@ -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