diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-29 14:53:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-29 14:53:11 -0400 |
| commit | 4b781474682434e7881f20e9dfbe6687ea619795 (patch) | |
| tree | bdd976645ead7f04900e60017502e6a41b03e601 /drivers/watchdog/Kconfig | |
| parent | 53f2c4a8fd882009a2a75c5b72d6898c0808616e (diff) | |
| parent | 29f772d41c01ad6b72c3de705e79779857badcde (diff) | |
Merge tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
Pull MFD changes from Samuel Ortiz:
"Besides the usual cleanups, this one brings:
* Support for 5 new chipsets: Intel's ICH LPC and SCH Centerton,
ST-E's STAX211, Samsung's MAX77693 and TI's LM3533.
* Device tree support for the twl6040, tps65910, da9502 and ab8500
drivers.
* Fairly big tps56910, ab8500 and db8500 updates.
* i2c support for mc13xxx.
* Our regular update for the wm8xxx driver from Mark."
Fix up various conflicts with other trees, largely due to ab5500 removal
etc.
* tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (106 commits)
mfd: Fix build break of max77693 by adding REGMAP_I2C option
mfd: Fix twl6040 build failure
mfd: Fix max77693 build failure
mfd: ab8500-core should depend on MFD_DB8500_PRCMU
gpio: tps65910: dt: process gpio specific device node info
mfd: Remove the parsing of dt info for tps65910 gpio
mfd: Save device node parsed platform data for tps65910 sub devices
mfd: Add r_select to lm3533 platform data
gpio: Add Intel Centerton support to gpio-sch
mfd: Emulate active low IRQs as well as active high IRQs for wm831x
mfd: Mark two lm3533 zone registers as volatile
mfd: Fix return type of lm533 attribute is_visible
mfd: Enable Device Tree support in the ab8500-pwm driver
mfd: Enable Device Tree support in the ab8500-sysctrl driver
mfd: Add support for Device Tree to twl6040
mfd: Register the twl6040 child for the ASoC codec unconditionally
mfd: Allocate twl6040 IRQ numbers dynamically
mfd: twl6040 code cleanup in interrupt initialization part
mfd: Enable ab8500-gpadc driver for Device Tree
mfd: Prevent unassigned pointer from being used in ab8500-gpadc driver
...
Diffstat (limited to 'drivers/watchdog/Kconfig')
| -rw-r--r-- | drivers/watchdog/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index a18bf6358eb8..d92d7488be16 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
| @@ -565,6 +565,7 @@ config INTEL_SCU_WATCHDOG | |||
| 565 | config ITCO_WDT | 565 | config ITCO_WDT |
| 566 | tristate "Intel TCO Timer/Watchdog" | 566 | tristate "Intel TCO Timer/Watchdog" |
| 567 | depends on (X86 || IA64) && PCI | 567 | depends on (X86 || IA64) && PCI |
| 568 | select LPC_ICH | ||
| 568 | ---help--- | 569 | ---help--- |
| 569 | Hardware driver for the intel TCO timer based watchdog devices. | 570 | Hardware driver for the intel TCO timer based watchdog devices. |
| 570 | These drivers are included in the Intel 82801 I/O Controller | 571 | These drivers are included in the Intel 82801 I/O Controller |