diff --git a/debian/arch/alpha/config.alpha-generic b/debian/arch/alpha/config.alpha-generic index a429fdc74..a3123a461 100644 --- a/debian/arch/alpha/config.alpha-generic +++ b/debian/arch/alpha/config.alpha-generic @@ -5,7 +5,6 @@ CONFIG_SBPCD=m CONFIG_CM206=m CONFIG_CDU31A=m CONFIG_MKISS=m -CONFIG_6PACK=m CONFIG_DMASCC=m CONFIG_IRPORT_SIR=m CONFIG_DONGLE_OLD=y diff --git a/debian/arch/alpha/config.alpha-smp b/debian/arch/alpha/config.alpha-smp index 91d97df66..eaf3ad0d9 100644 --- a/debian/arch/alpha/config.alpha-smp +++ b/debian/arch/alpha/config.alpha-smp @@ -6,4 +6,3 @@ CONFIG_HAVE_DEC_LOCK=y CONFIG_NR_CPUS=64 CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_MATHEMU=y -# CONFIG_6PACK is not set diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index 109a143e6..6e661be18 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -608,7 +608,6 @@ CONFIG_AX25=m # CONFIG_AX25_DAMA_SLAVE is not set CONFIG_NETROM=m CONFIG_ROSE=m -CONFIG_6PACK=m CONFIG_BPQETHER=m CONFIG_BAYCOM_SER_FDX=m CONFIG_BAYCOM_SER_HDX=m diff --git a/debian/arch/config b/debian/arch/config index 347f17288..9b67a168e 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -177,3 +177,4 @@ CONFIG_TCG_TPM=m CONFIG_TCG_ATMEL=m CONFIG_TCG_NSC=m # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set +CONFIG_6PACK=m diff --git a/debian/arch/i386/config.386 b/debian/arch/i386/config.386 index e732efab6..e84e81c35 100644 --- a/debian/arch/i386/config.386 +++ b/debian/arch/i386/config.386 @@ -46,7 +46,6 @@ CONFIG_SBPCD=m CONFIG_CM206=m CONFIG_CDU31A=m CONFIG_MKISS=m -CONFIG_6PACK=m CONFIG_DMASCC=m CONFIG_IRPORT_SIR=m # CONFIG_DONGLE_OLD is not set diff --git a/debian/arch/i386/config.686 b/debian/arch/i386/config.686 index adedc2396..925f3517d 100644 --- a/debian/arch/i386/config.686 +++ b/debian/arch/i386/config.686 @@ -35,7 +35,6 @@ CONFIG_SBPCD=m CONFIG_CM206=m CONFIG_CDU31A=m CONFIG_MKISS=m -CONFIG_6PACK=m CONFIG_DMASCC=m CONFIG_IRPORT_SIR=m # CONFIG_DONGLE_OLD is not set diff --git a/debian/arch/i386/config.686-smp b/debian/arch/i386/config.686-smp index 5d1757465..095fba943 100644 --- a/debian/arch/i386/config.686-smp +++ b/debian/arch/i386/config.686-smp @@ -39,7 +39,6 @@ CONFIG_HAVE_DEC_LOCK=y # CONFIG_CM206 is not set # CONFIG_CDU31A is not set # CONFIG_MKISS is not set -# CONFIG_6PACK is not set # CONFIG_DMASCC is not set # CONFIG_IRPORT_SIR is not set # CONFIG_NI5010 is not set diff --git a/debian/arch/i386/config.k7 b/debian/arch/i386/config.k7 index 798107e2a..054c1cbc4 100644 --- a/debian/arch/i386/config.k7 +++ b/debian/arch/i386/config.k7 @@ -36,7 +36,6 @@ CONFIG_SBPCD=m CONFIG_CM206=m CONFIG_CDU31A=m CONFIG_MKISS=m -CONFIG_6PACK=m CONFIG_DMASCC=m CONFIG_IRPORT_SIR=m # CONFIG_DONGLE_OLD is not set diff --git a/debian/arch/i386/config.k7-smp b/debian/arch/i386/config.k7-smp index a9127586e..12f900893 100644 --- a/debian/arch/i386/config.k7-smp +++ b/debian/arch/i386/config.k7-smp @@ -40,7 +40,6 @@ CONFIG_HAVE_DEC_LOCK=y # CONFIG_CM206 is not set # CONFIG_CDU31A is not set # CONFIG_MKISS is not set -# CONFIG_6PACK is not set # CONFIG_DMASCC is not set # CONFIG_IRPORT_SIR is not set # CONFIG_NI5010 is not set diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index ef8c90681..2d1c2554f 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -1500,4 +1500,3 @@ CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_TEST=m -CONFIG_6PACK=m diff --git a/debian/arch/ia64/config.itanium b/debian/arch/ia64/config.itanium index a7395d9cf..7ba6069fb 100644 --- a/debian/arch/ia64/config.itanium +++ b/debian/arch/ia64/config.itanium @@ -6,7 +6,6 @@ CONFIG_IA64_L1_CACHE_SHIFT=6 # CONFIG_SMP is not set # CONFIG_MTD_XIP is not set # CONFIG_MKISS is not set -# CONFIG_6PACK is not set # CONFIG_IRPORT_SIR is not set # CONFIG_PCMCIA_XIRTULIP is not set # CONFIG_COMPUTONE is not set diff --git a/debian/arch/ia64/config.mckinley b/debian/arch/ia64/config.mckinley index e5b4a24e7..8545d46e2 100644 --- a/debian/arch/ia64/config.mckinley +++ b/debian/arch/ia64/config.mckinley @@ -5,7 +5,6 @@ CONFIG_IA64_L1_CACHE_SHIFT=7 # CONFIG_SMP is not set # CONFIG_MTD_XIP is not set # CONFIG_MKISS is not set -# CONFIG_6PACK is not set # CONFIG_IRPORT_SIR is not set # CONFIG_PCMCIA_XIRTULIP is not set # CONFIG_COMPUTONE is not set diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 200a62acf..d907ddad4 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -1460,4 +1460,3 @@ CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_TEST=m -CONFIG_6PACK=m diff --git a/debian/changelog b/debian/changelog index 26fbc62bf..f30504bd6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,9 @@ linux-2.6 (2.6.12-2) UNRELEASED; urgency=low - rocket.c: Fix ldisc ref count handling - kbuild: build TAGS problem with O= + * Enable CONFIG_6PACK=m for all archs (Andres Salomon) + (closes: #319646) + -- Christian T. Steigies Sat, 6 Aug 2005 10:21:14 +0200 linux-2.6 (2.6.12-1) unstable; urgency=low