From 6c7885068e7284e9eea2475742b13bcb3dd77f37 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Mon, 21 May 2007 08:46:24 +0000 Subject: [PATCH] sync r8609 from trunk svn path=/dists/sid/linux-2.6/; revision=8618 --- debian/arch/sparc/config.sparc64 | 2 +- debian/changelog | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/arch/sparc/config.sparc64 b/debian/arch/sparc/config.sparc64 index 364f2db58..ffffaf158 100644 --- a/debian/arch/sparc/config.sparc64 +++ b/debian/arch/sparc/config.sparc64 @@ -33,7 +33,7 @@ CONFIG_NET_TULIP=y # CONFIG_IEEE1394_VERBOSEDEBUG is not set CONFIG_DISPLAY7SEG=m CONFIG_USB_UHCI_HCD=m -# CONFIG_USB_SERIAL is not set +CONFIG_USB_SERIAL=m # CONFIG_SCSI_IPR_TRACE is not set # CONFIG_DE4X5 is not set # CONFIG_PARPORT_PC_SUPERIO is not set diff --git a/debian/changelog b/debian/changelog index 2c46002a1..267ff120c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ linux-2.6 (2.6.21-3) UNRELEASED; urgency=low + [ Gordon Farquharson ] * arm/ixp4xx: Add patch to set NSLU2 timer frequency. - -- Gordon Farquharson Sun, 20 May 2007 09:19:54 -0600 + [ maximilian attems ] + * sparc64: enable USB_SERIAL. (closes: #412740) + + -- maximilian attems Mon, 21 May 2007 10:46:31 +0200 linux-2.6 (2.6.21-2) unstable; urgency=low