On Tue, Apr 6, 2010 at 23:59, Linux Kernel Mailing List
<[email protected]> wrote:
> Gitweb: http://git.kernel.org/linus/5e8037166497f8a1aa46325ed7febf0408d45caa
> Commit: 5e8037166497f8a1aa46325ed7febf0408d45caa
> Parent: 35c79780064976cf9d7537a00e59f97c2061fa7d
> Author: Marc Zyngier <[email protected]>
> AuthorDate: Mon Mar 29 20:09:14 2010 +0100
> Committer: Wim Van Sebroeck <[email protected]>
> CommitDate: Sat Apr 3 22:39:30 2010 +0000
>
> [WATCHDOG] set max63xx driver as ARM only
>
> Use of ioremap() causes build failure on S390.
> Restrict the driver to ARM until another architecture comes along
> and enables the driver for its own use.
>
> Signed-off-by: Marc Zyngier <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
> Signed-off-by: Andrew Morton <[email protected]>
> ---
> drivers/watchdog/Kconfig | 11 ++++++-----
> 1 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index bdcdbd5..0e8468f 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -55,11 +55,6 @@ config SOFT_WATCHDOG
> To compile this driver as a module, choose M here: the
> module will be called softdog.
>
> -config MAX63XX_WATCHDOG
> - tristate "Max63xx watchdog"
> - help
> - Support for memory mapped max63{69,70,71,72,73,74} watchdog timer.
> -
> config WM831X_WATCHDOG
> tristate "WM831x watchdog"
> depends on MFD_WM831X
> @@ -305,6 +300,12 @@ config TS72XX_WATCHDOG
> To compile this driver as a module, choose M here: the
> module will be called ts72xx_wdt.
>
> +config MAX63XX_WATCHDOG
> + tristate "Max63xx watchdog"
> + depends on ARM
Shouldn't that have been `depends on HAS_IOMEM' instead?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
On Wed, 7 Apr 2010 19:56:18 +0200
Geert Uytterhoeven <[email protected]> wrote:
> > +config MAX63XX_WATCHDOG
> > + tristate "Max63xx watchdog"
> > + depends on ARM
>
> Shouldn't that have been `depends on HAS_IOMEM' instead?
Using HAS_IOMEM will prevent the build of the driver on s390 and is
imho the correct dependency.
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
Hi Geert, Martin,
> > +config MAX63XX_WATCHDOG
> > + ? ? ? tristate "Max63xx watchdog"
> > + ? ? ? depends on ARM
>
> Shouldn't that have been `depends on HAS_IOMEM' instead?
Correct. Will add this today or tomorrow.
Kind regards,
Wim.