m68k/apollo: Rename "timer" to "apollo_timer"
authorGeert Uytterhoeven <geert@linux-m68k.org>
Fri, 20 Jul 2012 19:54:29 +0000 (21:54 +0200)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Sun, 22 Jul 2012 14:55:49 +0000 (16:55 +0200)
commit1525e06e4414dbe053ea10cbd8cc03bb150e8e27
treeeba136290d98b7150ee2bde8293b6619085e0217
parent897f3325a17e17dcdf8f3950a2b83542645902e5
m68k/apollo: Rename "timer" to "apollo_timer"

In file included from include/linux/kgdb.h:17,
                 from include/linux/fb.h:8,
                 from drivers/video/dnfb.c:15:
include/linux/serial_8250.h:71: error: expected identifier or ‘(’ before numeric constant
include/linux/serial_8250.h:72: error: expected ‘;’ before ‘struct’
make[1]: *** [drivers/video/dnfb.o] Error 1

This is caused by

    #define timer (IO_BASE + timer_physaddr)

in <asm/apollohw.h>, which conflicts with the new "timer" struct member in
<linux/serial_8250.h>.

Rename "timer" to "apollo_timer", as it's a way too generic name for a
global #define.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
--
http://kisskb.ellerman.id.au/kisskb/buildresult/6739606/
arch/m68k/apollo/config.c
arch/m68k/include/asm/apollohw.h