From 8013f4869abb25ed09d04be6729e303683f444d1 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 4 Dec 2009 17:04:19 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/config: Enable WATCHDOG and SOFT_WATCHDOG. svn path=/dists/trunk/linux-2.6/; revision=14727 --- debian/changelog | 1 + debian/config/alpha/config | 3 --- debian/config/armel/config.iop32x | 3 --- debian/config/armel/config.ixp4xx | 3 --- debian/config/armel/config.kirkwood | 1 - debian/config/armel/config.orion5x | 1 - debian/config/config | 5 ++++- debian/config/hppa/config | 5 ----- debian/config/ia64/config | 5 ----- debian/config/kernelarch-x86/config | 3 --- debian/config/mips/config.4kc-malta | 3 --- debian/config/mips/config.5kc-malta | 3 --- debian/config/mips/config.r4k-ip22 | 3 --- debian/config/mips/config.r5k-ip32 | 3 --- debian/config/mips/config.sb1-bcm91250a | 3 --- debian/config/mips/config.sb1a-bcm91480b | 3 --- debian/config/mipsel/config.r5k-cobalt | 1 - debian/config/powerpc/config | 3 --- debian/config/s390/config | 5 ----- debian/config/sparc/config | 5 ----- 20 files changed, 5 insertions(+), 57 deletions(-) diff --git a/debian/changelog b/debian/changelog index 36906ae73..ff71e790d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ linux-2.6 (2.6.32-1) UNRELEASED; urgency=low * Move contents of linux-support package to /usr/share. * Make linux-patch package depend against python. * Use python-support instead of python-central. + * Always enable software watchdog support. [ Ben Hutchings ] * Re-enable accidentally omitted drivers, thanks to Uwe Kleine-König diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 291ebbe55..63d69c5b4 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -1086,9 +1086,6 @@ CONFIG_FONT_8x16=y ## ## file: drivers/watchdog/Kconfig ## -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set -CONFIG_SOFT_WATCHDOG=m CONFIG_PCWATCHDOG=m CONFIG_MIXCOMWD=m CONFIG_WDT=m diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x index 17f6e3fbf..b7d2e24c4 100644 --- a/debian/config/armel/config.iop32x +++ b/debian/config/armel/config.iop32x @@ -641,9 +641,6 @@ CONFIG_USB_STORAGE=m ## ## file: drivers/watchdog/Kconfig ## -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set -# CONFIG_SOFT_WATCHDOG is not set # CONFIG_PCIPCWATCHDOG is not set # CONFIG_WDTPCI is not set # CONFIG_USBPCWATCHDOG is not set diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index 16ff18171..3f3af667e 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -719,9 +719,6 @@ CONFIG_USB_STORAGE_ALAUDA=y ## ## file: drivers/watchdog/Kconfig ## -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set -# CONFIG_SOFT_WATCHDOG is not set CONFIG_IXP4XX_WATCHDOG=m # CONFIG_PCIPCWATCHDOG is not set # CONFIG_WDTPCI is not set diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 7ed52bd4a..e5593fea5 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -628,7 +628,6 @@ CONFIG_FB=m ## ## file: drivers/watchdog/Kconfig ## -CONFIG_WATCHDOG=y CONFIG_ORION_WATCHDOG=m ## diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index f87652307..976dc599d 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -604,7 +604,6 @@ CONFIG_FB=m ## ## file: drivers/watchdog/Kconfig ## -CONFIG_WATCHDOG=y CONFIG_ORION_WATCHDOG=m ## diff --git a/debian/config/config b/debian/config/config index 9edcf23d7..b8e07c727 100644 --- a/debian/config/config +++ b/debian/config/config @@ -852,9 +852,9 @@ CONFIG_DVB_TTUSB_DEC=m ## file: drivers/media/radio/Kconfig ## CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_SI470X=y CONFIG_USB_MR800=m CONFIG_RADIO_TEA5764=m -CONFIG_RADIO_SI470X=y ## ## file: drivers/media/radio/si470x/Kconfig @@ -2425,6 +2425,9 @@ CONFIG_W1_SLAVE_BQ27000=m ## ## file: drivers/watchdog/Kconfig ## +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +CONFIG_SOFT_WATCHDOG=m CONFIG_WM8350_WATCHDOG=m CONFIG_ITCO_WDT=m # CONFIG_ITCO_VENDOR_SUPPORT is not set diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 9c55a080e..352b04661 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -618,11 +618,6 @@ CONFIG_LOGO_PARISC_CLUT224=y ## # CONFIG_W1 is not set -## -## file: drivers/watchdog/Kconfig -## -# CONFIG_WATCHDOG is not set - ## ## file: fs/cramfs/Kconfig ## diff --git a/debian/config/ia64/config b/debian/config/ia64/config index b67ac818c..7a058dc51 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -755,11 +755,6 @@ CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y CONFIG_LOGO_LINUX_CLUT224=y -## -## file: drivers/watchdog/Kconfig -## -# CONFIG_WATCHDOG is not set - ## ## file: fs/partitions/Kconfig ## diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index b0e66dad6..30b459b48 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1259,9 +1259,6 @@ CONFIG_FONT_8x16=y ## ## file: drivers/watchdog/Kconfig ## -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set -CONFIG_SOFT_WATCHDOG=m CONFIG_ACQUIRE_WDT=m CONFIG_ADVANTECH_WDT=m CONFIG_ALIM1535_WDT=m diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 1b1ad9d71..832433307 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1315,9 +1315,6 @@ CONFIG_FONT_8x16=y ## ## file: drivers/watchdog/Kconfig ## -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set -CONFIG_SOFT_WATCHDOG=m CONFIG_PCIPCWATCHDOG=m CONFIG_WDTPCI=m CONFIG_USBPCWATCHDOG=m diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index cf8d0fbf5..eadff7cfb 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1615,9 +1615,6 @@ CONFIG_W1_SLAVE_DS2433=m ## ## file: drivers/watchdog/Kconfig ## -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set -CONFIG_SOFT_WATCHDOG=m CONFIG_PCIPCWATCHDOG=m CONFIG_WDTPCI=m CONFIG_USBPCWATCHDOG=m diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index a9305ca77..5bcb19eb9 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -481,9 +481,6 @@ CONFIG_LOGO_SGI_CLUT224=y ## ## file: drivers/watchdog/Kconfig ## -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set -# CONFIG_SOFT_WATCHDOG is not set CONFIG_INDYDOG=m # CONFIG_PCWATCHDOG is not set # CONFIG_MIXCOMWD is not set diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index 0d6263fd5..ba525d5b8 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -603,9 +603,6 @@ CONFIG_LOGO_SGI_CLUT224=y ## ## file: drivers/watchdog/Kconfig ## -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set -# CONFIG_SOFT_WATCHDOG is not set # CONFIG_PCIPCWATCHDOG is not set # CONFIG_WDTPCI is not set diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index 854a4ee10..bb6a66ed6 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -781,9 +781,6 @@ CONFIG_LOGO=y ## ## file: drivers/watchdog/Kconfig ## -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set -# CONFIG_SOFT_WATCHDOG is not set # CONFIG_PCIPCWATCHDOG is not set # CONFIG_WDTPCI is not set # CONFIG_USBPCWATCHDOG is not set diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index 23e61c1e3..254127c1c 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -811,9 +811,6 @@ CONFIG_LOGO=y ## ## file: drivers/watchdog/Kconfig ## -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set -# CONFIG_SOFT_WATCHDOG is not set # CONFIG_PCIPCWATCHDOG is not set # CONFIG_WDTPCI is not set # CONFIG_USBPCWATCHDOG is not set diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index a524a4cd2..f5c3a354b 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -735,7 +735,6 @@ CONFIG_FB_COBALT=m ## ## file: drivers/watchdog/Kconfig ## -# CONFIG_WATCHDOG is not set ## ## file: fs/cramfs/Kconfig diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 2f5a2af75..738481f4b 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -857,9 +857,6 @@ CONFIG_LOGO_LINUX_VGA16=y ## ## file: drivers/watchdog/Kconfig ## -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set -CONFIG_SOFT_WATCHDOG=m CONFIG_WATCHDOG_RTAS=m CONFIG_PCIPCWATCHDOG=m CONFIG_WDTPCI=m diff --git a/debian/config/s390/config b/debian/config/s390/config index a8ed44de7..fb414dccc 100644 --- a/debian/config/s390/config +++ b/debian/config/s390/config @@ -148,11 +148,6 @@ CONFIG_ZFCP=m # CONFIG_SPEAKUP_SYNTH_TXPRT is not set # CONFIG_SPEAKUP_SYNTH_DUMMY is not set -## -## file: drivers/watchdog/Kconfig -## -# CONFIG_WATCHDOG is not set - ## ## file: fs/partitions/Kconfig ## diff --git a/debian/config/sparc/config b/debian/config/sparc/config index d5fa8c390..5c9bca9ce 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -547,11 +547,6 @@ CONFIG_LOGO_SUN_CLUT224=y ## # CONFIG_W1 is not set -## -## file: drivers/watchdog/Kconfig -## -# CONFIG_WATCHDOG is not set - ## ## file: fs/partitions/Kconfig ##