diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:31 -0400 |
| commit | 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch) | |
| tree | 51c50bcb67a5039448ddfa1869d7948cab1217e9 /drivers/watchdog/Kconfig | |
| parent | 19c1a6f5764d787113fa323ffb18be7991208f82 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base,
update it to .30-rc5 to refresh.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 63024145215d..5eb8f21da82e 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
| @@ -240,8 +240,6 @@ config ORION5X_WATCHDOG | |||
| 240 | To compile this driver as a module, choose M here: the | 240 | To compile this driver as a module, choose M here: the |
| 241 | module will be called orion5x_wdt. | 241 | module will be called orion5x_wdt. |
| 242 | 242 | ||
| 243 | # ARM26 Architecture | ||
| 244 | |||
| 245 | # AVR32 Architecture | 243 | # AVR32 Architecture |
| 246 | 244 | ||
| 247 | config AT32AP700X_WDT | 245 | config AT32AP700X_WDT |