diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-04-30 06:30:24 -0400 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-04-30 06:42:13 -0400 |
| commit | a614e1923d5389d01f3545ee4a90e39a04d0c90d (patch) | |
| tree | e8e32dba12a66ffd26d78f015a142ac28e19ad8e /drivers/watchdog | |
| parent | f53f292eeaa234615c31a1306babe703fc4263f2 (diff) | |
| parent | c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 (diff) | |
Merge tag 'v3.9' into efi-for-tip2
Resolve conflicts for Ingo.
Conflicts:
drivers/firmware/Kconfig
drivers/firmware/efivars.c
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'drivers/watchdog')
| -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 9fcc70c11cea..e89fc3133972 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
| @@ -117,7 +117,7 @@ config ARM_SP805_WATCHDOG | |||
| 117 | 117 | ||
| 118 | config AT91RM9200_WATCHDOG | 118 | config AT91RM9200_WATCHDOG |
| 119 | tristate "AT91RM9200 watchdog" | 119 | tristate "AT91RM9200 watchdog" |
| 120 | depends on ARCH_AT91 | 120 | depends on ARCH_AT91RM9200 |
| 121 | help | 121 | help |
| 122 | Watchdog timer embedded into AT91RM9200 chips. This will reboot your | 122 | Watchdog timer embedded into AT91RM9200 chips. This will reboot your |
| 123 | system when the timeout is reached. | 123 | system when the timeout is reached. |