From 9ddce5fa578efd29a3319d79a7f2d718a1855fcd Mon Sep 17 00:00:00 2001 From: dann frazier Date: Wed, 4 Jan 2006 04:47:43 +0000 Subject: [PATCH] * [ia64] Update config for 2.6.15. svn path=/dists/trunk/linux-2.6/; revision=5218 --- debian/arch/ia64/config | 1 - debian/changelog | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index 8ce7464b7..2ff4cfdb9 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -422,7 +422,6 @@ CONFIG_BRIDGE_EBT_ULOG=m CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set -CONFIG_SCTP_HMAC_NONE=y # CONFIG_ATM is not set CONFIG_BRIDGE=m CONFIG_DECNET=m diff --git a/debian/changelog b/debian/changelog index 75a2da89d..6fa201ef0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -linux-2.6 (2.6.15-2) unstable; urgency=low +linux-2.6 (2.6.15-2) UNRELEASED; urgency=low [ maximilian attems ] * Default to initramfs-tools as initramfs generator. - -- maximilian attems Tue, 3 Jan 2006 16:28:30 +0100 + [ dann frazier ] + * [ia64] Update config for 2.6.15. + + -- dann frazier Tue, 3 Jan 2006 21:46:44 -0700 linux-2.6 (2.6.15-1) unstable; urgency=low