diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
| commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
| tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/watchdog/Kconfig | |
| parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
| parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) | |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'drivers/watchdog/Kconfig')
| -rw-r--r-- | drivers/watchdog/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index b69d71482554..1b0f98bc51b5 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
| @@ -933,7 +933,7 @@ config PNX833X_WDT | |||
| 933 | depends on SOC_PNX8335 | 933 | depends on SOC_PNX8335 |
| 934 | help | 934 | help |
| 935 | Hardware driver for the PNX833x's watchdog. This is a | 935 | Hardware driver for the PNX833x's watchdog. This is a |
| 936 | watchdog timer that will reboot the machine after a programable | 936 | watchdog timer that will reboot the machine after a programmable |
| 937 | timer has expired and no process has written to /dev/watchdog during | 937 | timer has expired and no process has written to /dev/watchdog during |
| 938 | that time. | 938 | that time. |
| 939 | 939 | ||