diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2010-04-07 13:57:02 -0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2010-04-16 08:26:32 -0400 |
| commit | aebaec975f30c4db40bb418fe9117bb6b4655b1b (patch) | |
| tree | f441ed82aac8e5390c717db098393c853fae62ff /drivers | |
| parent | b1183e064a3f95d27351b2d2c811b50bf4d770a4 (diff) | |
[WATCHDOG] max63xx driver depends on ioremap()
Correct fix for the "ioremap() causes build failure on S390" should have been
a dependancy on HAS_IOMEM. So we add this dependancy also (and leave the driver
in the ARM section for now).
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers')
| -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 3a6aa0ff975..0bf5020d0d3 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
| @@ -302,7 +302,7 @@ config TS72XX_WATCHDOG | |||
| 302 | 302 | ||
| 303 | config MAX63XX_WATCHDOG | 303 | config MAX63XX_WATCHDOG |
| 304 | tristate "Max63xx watchdog" | 304 | tristate "Max63xx watchdog" |
| 305 | depends on ARM | 305 | depends on ARM && HAS_IOMEM |
| 306 | help | 306 | help |
| 307 | Support for memory mapped max63{69,70,71,72,73,74} watchdog timer. | 307 | Support for memory mapped max63{69,70,71,72,73,74} watchdog timer. |
| 308 | 308 | ||