diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index f8dbdf666..875e44ddf 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -210,6 +210,7 @@ CONFIG_BLK_DEV_IDETAPE=m CONFIG_BLK_DEV_IDEFLOPPY=m CONFIG_IDE_TASK_IOCTL=y CONFIG_IDE_GENERIC=m +# CONFIG_BLK_DEV_IDEPNP is not set CONFIG_BLK_DEV_IDEPCI=y CONFIG_IDEPCI_SHARE_IRQ=y # CONFIG_BLK_DEV_OFFBOARD is not set diff --git a/debian/arch/alpha/config.alpha-smp b/debian/arch/alpha/config.alpha-smp index eaf3ad0d9..a15441d68 100644 --- a/debian/arch/alpha/config.alpha-smp +++ b/debian/arch/alpha/config.alpha-smp @@ -6,3 +6,5 @@ CONFIG_HAVE_DEC_LOCK=y CONFIG_NR_CPUS=64 CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_MATHEMU=y +CONFIG_MKISS=m +# CONFIG_DIGIEPCA is not set diff --git a/debian/changelog b/debian/changelog index c7b8b470a..c61e47e9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux-2.6 (2.6.13+2.6.14-rc5-0experimental.2) UNRELEASED; urgency=low + + [ Norbert Tretkowski ] + * [alpha] Update arch/alpha/config* for 2.6.14. + + -- Norbert Tretkowski Tue, 25 Oct 2005 20:33:25 +0200 + linux-2.6 (2.6.13+2.6.14-rc5-0experimental.1) experimental; urgency=low [ Sven Luther ] @@ -50,7 +57,7 @@ linux-2.6 (2.6.13-2) UNRELEASED; urgency=low popular demand. (closes: #330916) [ Norbert Tretkowski ] - * [alpha] Update arch/alpha/config for 2.6.13 + * [alpha] Update arch/alpha/config for 2.6.13. [ Kyle McMartin ] * [hppa] Oops. Fix linux-headers not including asm-parisc by adding