From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Fri, 20 Jul 2012 19:54:29 +0000 (+0200)
Subject: m68k/apollo: Rename "timer" to "apollo_timer"
X-Git-Tag: v3.6-rc2~42^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1525e06e4414dbe053ea10cbd8cc03bb150e8e27;p=pandora-kernel.git

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/
---

Reading git-diff-tree failed