[kernel] r14727 - in dists/trunk/linux-2.6/debian: . config config/alpha config/armel config/hppa config/ia64 config/kernelarch-x86 config/mips config/mipsel config/powerpc config/s390 config/sparc
Bastian Blank
waldi at alioth.debian.org
Fri Dec 4 17:04:26 UTC 2009
Author: waldi
Date: Fri Dec 4 17:04:19 2009
New Revision: 14727
Log:
* debian/changelog: Update.
* debian/config: Enable WATCHDOG and SOFT_WATCHDOG.
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/alpha/config
dists/trunk/linux-2.6/debian/config/armel/config.iop32x
dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
dists/trunk/linux-2.6/debian/config/armel/config.orion5x
dists/trunk/linux-2.6/debian/config/config
dists/trunk/linux-2.6/debian/config/hppa/config
dists/trunk/linux-2.6/debian/config/ia64/config
dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
dists/trunk/linux-2.6/debian/config/powerpc/config
dists/trunk/linux-2.6/debian/config/s390/config
dists/trunk/linux-2.6/debian/config/sparc/config
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/changelog Fri Dec 4 17:04:19 2009 (r14727)
@@ -17,6 +17,7 @@
* 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
Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/alpha/config Fri Dec 4 17:04:19 2009 (r14727)
@@ -1086,9 +1086,6 @@
##
## 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
Modified: dists/trunk/linux-2.6/debian/config/armel/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.iop32x Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/armel/config.iop32x Fri Dec 4 17:04:19 2009 (r14727)
@@ -641,9 +641,6 @@
##
## 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
Modified: dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx Fri Dec 4 17:04:19 2009 (r14727)
@@ -719,9 +719,6 @@
##
## 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
Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Fri Dec 4 17:04:19 2009 (r14727)
@@ -628,7 +628,6 @@
##
## file: drivers/watchdog/Kconfig
##
-CONFIG_WATCHDOG=y
CONFIG_ORION_WATCHDOG=m
##
Modified: dists/trunk/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.orion5x Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/armel/config.orion5x Fri Dec 4 17:04:19 2009 (r14727)
@@ -604,7 +604,6 @@
##
## file: drivers/watchdog/Kconfig
##
-CONFIG_WATCHDOG=y
CONFIG_ORION_WATCHDOG=m
##
Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/config Fri Dec 4 17:04:19 2009 (r14727)
@@ -852,9 +852,9 @@
## 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 @@
##
## 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
Modified: dists/trunk/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/hppa/config Fri Dec 4 17:04:19 2009 (r14727)
@@ -619,11 +619,6 @@
# CONFIG_W1 is not set
##
-## file: drivers/watchdog/Kconfig
-##
-# CONFIG_WATCHDOG is not set
-
-##
## file: fs/cramfs/Kconfig
##
CONFIG_CRAMFS=y
Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/ia64/config Fri Dec 4 17:04:19 2009 (r14727)
@@ -756,11 +756,6 @@
CONFIG_LOGO_LINUX_CLUT224=y
##
-## file: drivers/watchdog/Kconfig
-##
-# CONFIG_WATCHDOG is not set
-
-##
## file: fs/partitions/Kconfig
##
CONFIG_ACORN_PARTITION=y
Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Fri Dec 4 17:04:19 2009 (r14727)
@@ -1259,9 +1259,6 @@
##
## 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
Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Fri Dec 4 17:04:19 2009 (r14727)
@@ -1315,9 +1315,6 @@
##
## 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
Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Fri Dec 4 17:04:19 2009 (r14727)
@@ -1615,9 +1615,6 @@
##
## 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
Modified: dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22 Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22 Fri Dec 4 17:04:19 2009 (r14727)
@@ -481,9 +481,6 @@
##
## 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
Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 Fri Dec 4 17:04:19 2009 (r14727)
@@ -603,9 +603,6 @@
##
## 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
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a Fri Dec 4 17:04:19 2009 (r14727)
@@ -781,9 +781,6 @@
##
## 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
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Fri Dec 4 17:04:19 2009 (r14727)
@@ -811,9 +811,6 @@
##
## 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
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt Fri Dec 4 17:04:19 2009 (r14727)
@@ -735,7 +735,6 @@
##
## file: drivers/watchdog/Kconfig
##
-# CONFIG_WATCHDOG is not set
##
## file: fs/cramfs/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config Fri Dec 4 17:04:19 2009 (r14727)
@@ -857,9 +857,6 @@
##
## 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
Modified: dists/trunk/linux-2.6/debian/config/s390/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/config Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/s390/config Fri Dec 4 17:04:19 2009 (r14727)
@@ -149,11 +149,6 @@
# CONFIG_SPEAKUP_SYNTH_DUMMY is not set
##
-## file: drivers/watchdog/Kconfig
-##
-# CONFIG_WATCHDOG is not set
-
-##
## file: fs/partitions/Kconfig
##
# CONFIG_ACORN_PARTITION is not set
Modified: dists/trunk/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config Fri Dec 4 17:03:54 2009 (r14726)
+++ dists/trunk/linux-2.6/debian/config/sparc/config Fri Dec 4 17:04:19 2009 (r14727)
@@ -548,11 +548,6 @@
# CONFIG_W1 is not set
##
-## file: drivers/watchdog/Kconfig
-##
-# CONFIG_WATCHDOG is not set
-
-##
## file: fs/partitions/Kconfig
##
# CONFIG_ACORN_PARTITION is not set
More information about the Kernel-svn-changes
mailing list