debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

* debian/changelog: Update. 

* debian/config: Enable WATCHDOG and SOFT_WATCHDOG.

svn path=/dists/trunk/linux-2.6/; revision=14727
This commit is contained in:
Bastian Blank 2009-12-04 17:04:19 +00:00
parent e5d7296470
commit 8013f4869a
20 changed files with 5 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -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

3
debian/config/alpha/config vendored
View File

@ -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

3
debian/config/armel/config.iop32x vendored
View File

@ -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

3
debian/config/armel/config.ixp4xx vendored
View File

@ -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

1
debian/config/armel/config.kirkwood vendored
View File

@ -628,7 +628,6 @@ CONFIG_FB=m
##
## file: drivers/watchdog/Kconfig
##
CONFIG_WATCHDOG=y
CONFIG_ORION_WATCHDOG=m
##

1
debian/config/armel/config.orion5x vendored
View File

@ -604,7 +604,6 @@ CONFIG_FB=m
##
## file: drivers/watchdog/Kconfig
##
CONFIG_WATCHDOG=y
CONFIG_ORION_WATCHDOG=m
##

5
debian/config/config vendored
View File

@ -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

5
debian/config/hppa/config vendored
View File

@ -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
##

5
debian/config/ia64/config vendored
View File

@ -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
##

3
debian/config/kernelarch-x86/config vendored
View File

@ -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

3
debian/config/mips/config.4kc-malta vendored
View File

@ -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

3
debian/config/mips/config.5kc-malta vendored
View File

@ -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

3
debian/config/mips/config.r4k-ip22 vendored
View File

@ -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

3
debian/config/mips/config.r5k-ip32 vendored
View File

@ -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

3
debian/config/mips/config.sb1-bcm91250a vendored
View File

@ -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

3
debian/config/mips/config.sb1a-bcm91480b vendored
View File

@ -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

1
debian/config/mipsel/config.r5k-cobalt vendored
View File

@ -735,7 +735,6 @@ CONFIG_FB_COBALT=m
##
## file: drivers/watchdog/Kconfig
##
# CONFIG_WATCHDOG is not set
##
## file: fs/cramfs/Kconfig

3
debian/config/powerpc/config vendored
View File

@ -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

5
debian/config/s390/config vendored
View File

@ -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
##

5
debian/config/sparc/config vendored
View File

@ -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
##