From ffab9409fa21856eb44647933681022efc30d8e5 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 14 Mar 2008 20:56:42 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/config - Enable AF_RXRPC and RXKAD. - Disable R3964. svn path=/dists/trunk/linux-2.6/; revision=10873 --- debian/changelog | 2 ++ debian/config/alpha/config | 1 - debian/config/amd64/config | 7 ------- debian/config/arm/config.footbridge | 1 - debian/config/arm/config.iop32x | 1 - debian/config/arm/config.ixp4xx | 1 - debian/config/arm/config.versatile | 8 -------- debian/config/config | 7 +++++++ debian/config/hppa/config | 1 - debian/config/i386/config | 8 -------- debian/config/ia64/config | 1 - debian/config/m68k/config | 1 - debian/config/mips/config.5kc-malta | 7 ------- debian/config/mipsel/config.4kc-malta | 1 - debian/config/mipsel/config.5kc-malta | 8 -------- debian/config/mipsel/config.r5k-cobalt | 1 - debian/config/mipsel/config.sb1-bcm91250a | 1 - debian/config/mipsel/config.sb1a-bcm91480b | 1 - debian/config/powerpc/config | 1 - 19 files changed, 9 insertions(+), 50 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8b7d2549e..5f0410694 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,6 +71,8 @@ linux-2.6 (2.6.25~rc5-1~experimental.1) UNRELEASED; urgency=low - Broadcom NetXtremeII support * [powerpc] Use new wrapper install support. * [s390] Enable DM_MULTIPATH_EMC. + * Enable AF_RXRPC and RXKAD. + * Disable R3964. -- Bastian Blank Tue, 26 Feb 2008 23:59:55 -0700 diff --git a/debian/config/alpha/config b/debian/config/alpha/config index edd96734c..11a6f8d41 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -184,7 +184,6 @@ CONFIG_RTC=m CONFIG_GEN_RTC=m CONFIG_GEN_RTC_X=y CONFIG_DTLK=m -CONFIG_R3964=m CONFIG_APPLICOM=m CONFIG_RAW_DRIVER=m CONFIG_MAX_RAW_DEVS=256 diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 6ed51f090..06b327c8c 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -1618,13 +1618,6 @@ CONFIG_LAPB=m ## CONFIG_LLC2=m -## -## file: net/rxrpc/Kconfig -## -CONFIG_AF_RXRPC=m -# CONFIG_AF_RXRPC_DEBUG is not set -CONFIG_RXKAD=m - ## ## file: net/wanrouter/Kconfig ## diff --git a/debian/config/arm/config.footbridge b/debian/config/arm/config.footbridge index 52fa8653c..59d3b117e 100644 --- a/debian/config/arm/config.footbridge +++ b/debian/config/arm/config.footbridge @@ -207,7 +207,6 @@ CONFIG_NWFLASH=m CONFIG_NVRAM=m CONFIG_RTC=y # CONFIG_DTLK is not set -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set ## diff --git a/debian/config/arm/config.iop32x b/debian/config/arm/config.iop32x index 93505acd3..8351c23dc 100644 --- a/debian/config/arm/config.iop32x +++ b/debian/config/arm/config.iop32x @@ -139,7 +139,6 @@ CONFIG_HW_CONSOLE=y # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_NVRAM is not set # CONFIG_DTLK is not set -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_TELCLOCK is not set diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx index 3f4d64a2e..842a746e6 100644 --- a/debian/config/arm/config.ixp4xx +++ b/debian/config/arm/config.ixp4xx @@ -131,7 +131,6 @@ CONFIG_HW_CONSOLE=y # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_NVRAM is not set # CONFIG_DTLK is not set -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set CONFIG_TELCLOCK=m diff --git a/debian/config/arm/config.versatile b/debian/config/arm/config.versatile index 0a8117e26..f67e01ac0 100644 --- a/debian/config/arm/config.versatile +++ b/debian/config/arm/config.versatile @@ -256,7 +256,6 @@ CONFIG_HW_CONSOLE=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_NVRAM is not set -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set CONFIG_DEVPORT=y @@ -1539,13 +1538,6 @@ CONFIG_LLC2=y CONFIG_RFKILL=m CONFIG_RFKILL_INPUT=m -## -## file: net/rxrpc/Kconfig -## -CONFIG_AF_RXRPC=m -# CONFIG_AF_RXRPC_DEBUG is not set -# CONFIG_RXKAD is not set - ## ## file: net/wanrouter/Kconfig ## diff --git a/debian/config/config b/debian/config/config index 0029e00b7..4ed47de90 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2242,6 +2242,13 @@ CONFIG_PACKET_MMAP=y CONFIG_RFKILL=m CONFIG_RFKILL_INPUT=m +## +## file: net/rxrpc/Kconfig +## +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +CONFIG_RXKAD=m + ## ## file: net/sched/Kconfig ## diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 254eb4cd8..18a885f2d 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -63,7 +63,6 @@ CONFIG_PRINTER=m CONFIG_GEN_RTC=y # CONFIG_GEN_RTC_X is not set # CONFIG_DTLK is not set -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set ## diff --git a/debian/config/i386/config b/debian/config/i386/config index 5867605ab..f48cce8ac 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -317,7 +317,6 @@ CONFIG_RTC=m CONFIG_GEN_RTC=m CONFIG_GEN_RTC_X=y CONFIG_DTLK=m -CONFIG_R3964=m CONFIG_APPLICOM=m CONFIG_SONYPI=m CONFIG_MWAVE=m @@ -1884,13 +1883,6 @@ CONFIG_LAPB=m ## CONFIG_LLC2=m -## -## file: net/rxrpc/Kconfig -## -CONFIG_AF_RXRPC=m -# CONFIG_AF_RXRPC_DEBUG is not set -CONFIG_RXKAD=m - ## ## file: net/wanrouter/Kconfig ## diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 13e2028bf..d875ba0eb 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -115,7 +115,6 @@ CONFIG_PRINTER=m CONFIG_PPDEV=m CONFIG_EFI_RTC=y CONFIG_DTLK=m -CONFIG_R3964=m CONFIG_APPLICOM=m CONFIG_RAW_DRIVER=m CONFIG_MAX_RAW_DEVS=256 diff --git a/debian/config/m68k/config b/debian/config/m68k/config index 618e67d0e..99aecc5a9 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -29,7 +29,6 @@ CONFIG_HW_CONSOLE=y # CONFIG_SERIAL_NONSTANDARD is not set CONFIG_GEN_RTC_X=y # CONFIG_DTLK is not set -# CONFIG_R3964 is not set ## ## file: drivers/char/drm/Kconfig diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index e0fd26fe0..2a251c97f 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -2669,13 +2669,6 @@ CONFIG_PACKET_MMAP=y CONFIG_RFKILL=m CONFIG_RFKILL_INPUT=m -## -## file: net/rxrpc/Kconfig -## -CONFIG_AF_RXRPC=m -# CONFIG_AF_RXRPC_DEBUG is not set -# CONFIG_RXKAD is not set - ## ## file: net/sched/Kconfig ## diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta index 615a2cc18..376011cbc 100644 --- a/debian/config/mipsel/config.4kc-malta +++ b/debian/config/mipsel/config.4kc-malta @@ -307,7 +307,6 @@ CONFIG_PRINTER=m CONFIG_PPDEV=m CONFIG_RTC=y CONFIG_DTLK=m -CONFIG_R3964=m CONFIG_APPLICOM=m ## diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta index 2d1600cc5..4f4a95892 100644 --- a/debian/config/mipsel/config.5kc-malta +++ b/debian/config/mipsel/config.5kc-malta @@ -297,7 +297,6 @@ CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m CONFIG_RTC=y -CONFIG_R3964=m CONFIG_APPLICOM=m ## @@ -2654,13 +2653,6 @@ CONFIG_PACKET_MMAP=y CONFIG_RFKILL=m CONFIG_RFKILL_INPUT=m -## -## file: net/rxrpc/Kconfig -## -CONFIG_AF_RXRPC=m -# CONFIG_AF_RXRPC_DEBUG is not set -# CONFIG_RXKAD is not set - ## ## file: net/sched/Kconfig ## diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 2fef95832..f85e06835 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -156,7 +156,6 @@ CONFIG_HW_CONSOLE=y # CONFIG_GEN_RTC is not set CONFIG_COBALT_LCD=y # CONFIG_DTLK is not set -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_TELCLOCK is not set diff --git a/debian/config/mipsel/config.sb1-bcm91250a b/debian/config/mipsel/config.sb1-bcm91250a index 203a2c1a6..3bc3766eb 100644 --- a/debian/config/mipsel/config.sb1-bcm91250a +++ b/debian/config/mipsel/config.sb1-bcm91250a @@ -203,7 +203,6 @@ CONFIG_RTC=m CONFIG_GEN_RTC=y CONFIG_GEN_RTC_X=y # CONFIG_DTLK is not set -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_TELCLOCK is not set diff --git a/debian/config/mipsel/config.sb1a-bcm91480b b/debian/config/mipsel/config.sb1a-bcm91480b index bb49a1e1a..8afd3fda9 100644 --- a/debian/config/mipsel/config.sb1a-bcm91480b +++ b/debian/config/mipsel/config.sb1a-bcm91480b @@ -200,7 +200,6 @@ CONFIG_RTC=m CONFIG_GEN_RTC=y CONFIG_GEN_RTC_X=y # CONFIG_DTLK is not set -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_TELCLOCK is not set diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 36774bf5c..76309fcac 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -145,7 +145,6 @@ CONFIG_NVRAM=y CONFIG_GEN_RTC=y CONFIG_GEN_RTC_X=y CONFIG_DTLK=m -CONFIG_R3964=m CONFIG_APPLICOM=m ##