2010-02-20 00:29:44

by Roel Kluin

Subject: [PATCH] m68k,m68knommu: missing asterisk?

An asterisk was missing.

Signed-off-by: Roel Kluin <[email protected]>
---
Correct?

arch/m68k/include/asm/apollohw.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/m68k/include/asm/apollohw.h b/arch/m68k/include/asm/apollohw.h
index a1373b9..87e0cc4 100644
--- a/arch/m68k/include/asm/apollohw.h
+++ b/arch/m68k/include/asm/apollohw.h
@@ -94,7 +94,7 @@ extern u_long timer_physaddr;

#define sio01 ((*(volatile struct SCN2681 *)(IO_BASE + sio01_physaddr)))
#define sio23 ((*(volatile struct SCN2681 *)(IO_BASE + sio23_physaddr)))
-#define rtc (((volatile struct mc146818 *)(IO_BASE + rtc_physaddr)))
+#define rtc ((*(volatile struct mc146818 *)(IO_BASE + rtc_physaddr)))
#define cpuctrl (*(volatile unsigned int *)(IO_BASE + cpuctrl_physaddr))
#define pica (IO_BASE + pica_physaddr)
#define picb (IO_BASE + picb_physaddr)

2010-02-23 06:13:38

by Geert Uytterhoeven

Subject: Re: [PATCH] m68k,m68knommu: missing asterisk?

On Sat, Feb 20, 2010 at 01:37, Roel Kluin <[email protected]> wrote:
> An asterisk was missing.
>
> Signed-off-by: Roel Kluin <[email protected]>
> ---
> Correct?

No, see arch/m68k/apollo/config.c:dn_dummy_hwclk().
Andrew: please dequeue.

>  arch/m68k/include/asm/apollohw.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/m68k/include/asm/apollohw.h b/arch/m68k/include/asm/apollohw.h
> index a1373b9..87e0cc4 100644
> --- a/arch/m68k/include/asm/apollohw.h
> +++ b/arch/m68k/include/asm/apollohw.h
> @@ -94,7 +94,7 @@ extern u_long timer_physaddr;
>
>  #define sio01 ((*(volatile struct SCN2681 *)(IO_BASE + sio01_physaddr)))
>  #define sio23 ((*(volatile struct SCN2681 *)(IO_BASE + sio23_physaddr)))
> -#define rtc (((volatile struct mc146818 *)(IO_BASE + rtc_physaddr)))
> +#define rtc ((*(volatile struct mc146818 *)(IO_BASE + rtc_physaddr)))
>  #define cpuctrl (*(volatile unsigned int *)(IO_BASE + cpuctrl_physaddr))
>  #define pica (IO_BASE + pica_physaddr)
>  #define picb (IO_BASE + picb_physaddr)

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