topconfig enable modular WM831X_WATCHDOG

svn path=/dists/trunk/linux-2.6/; revision=14861
This commit is contained in:
Maximilian Attems 2010-01-03 23:51:51 +00:00
parent a799ad4f1c
commit e90f8acd2e
2 changed files with 2 additions and 1 deletions

2
debian/changelog vendored
View File

@ -14,7 +14,7 @@ linux-2.6 (2.6.32-4) UNRELEASED; urgency=low
KS8851, KS8851_MLL, MISDN_AVMFRITZ, MISDN_SPEEDFAX, MISDN_INFINEON,
MISDN_W6692, MISDN_NETJET, INPUT_WINBOND_CIR, BATTERY_DS2782, MFD_WM831X,
MFD_MC13783, MTD_SST25L, TOUCHSCREEN_USB_E2I, INPUT_WM831X_ON,
SENSORS_WM831X.
SENSORS_WM831X, WM831X_WATCHDOG.
* [x86] set ACPI_POWER_METER, ACPI_PROCESSOR_AGGREGATOR.
[ dann frazier ]

View File

@ -2508,6 +2508,7 @@ CONFIG_W1_SLAVE_BQ27000=m
CONFIG_WATCHDOG=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
CONFIG_SOFT_WATCHDOG=m
CONFIG_WM831X_WATCHDOG=m
CONFIG_WM8350_WATCHDOG=m
CONFIG_SBC_FITPC2_WATCHDOG=m
CONFIG_ITCO_WDT=m