diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 21:29:07 (GMT) |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 21:29:07 (GMT) |
commit | f499cae1e59d75d5eb24c23d47cf8986e6032c6d (patch) | |
tree | 1af6235c18391212c40116eb90b01eae8938efee /drivers/watchdog/Kconfig | |
parent | fc3f55e672e1ed917dd9e215af81939cd3d717da (diff) | |
parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
download | linux-fsl-qoriq-f499cae1e59d75d5eb24c23d47cf8986e6032c6d.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/watchdog/Kconfig')
-rw-r--r-- | drivers/watchdog/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 6302414..5eb8f21 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -240,8 +240,6 @@ config ORION5X_WATCHDOG To compile this driver as a module, choose M here: the module will be called orion5x_wdt. -# ARM26 Architecture - # AVR32 Architecture config AT32AP700X_WDT |