linux-stable/arch/m68k
Geert Uytterhoeven 1525e06e44 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/
2012-07-22 16:55:49 +02:00
..
amiga m68k/amiga: Use arch_initcall() for registering platform devices 2012-04-22 20:16:48 +02:00
apollo m68k/apollo: Rename "timer" to "apollo_timer" 2012-07-22 16:55:49 +02:00
atari m68k/atari: Change VME irq numbers from unsigned long to unsigned int 2012-04-22 20:16:49 +02:00
bvme6000 Disintegrate asm/system.h for M68K 2012-03-28 18:30:02 +01:00
configs m68k: add a defconfig for the M5475EVB ColdFire with MMU board 2012-05-20 21:23:05 +10:00
emu TTY: remove re-assignments to tty_driver members 2012-03-08 11:37:58 -08:00
fpsp040 Fix common misspellings 2011-03-31 11:26:23 -03:00
hp300 Disintegrate asm/system.h for M68K 2012-03-28 18:30:02 +01:00
ifpsp060 Fix common misspellings 2011-03-31 11:26:23 -03:00
include/asm m68k/apollo: Rename "timer" to "apollo_timer" 2012-07-22 16:55:49 +02:00
kernel m68k: Replace m68k-specific _[se]bss by generic __bss_{start,stop} 2012-06-27 09:59:43 +02:00
lib m68k: delay, muldi3 - Use CONFIG_CPU_HAS_NO_MULDIV64 2012-06-10 10:18:30 +02:00
mac m68k/mac: Add missing platform check before registering platform devices 2012-04-01 22:57:51 +02:00
math-emu m68k/math-emu: Remove unnecessary code 2011-07-30 21:21:40 +02:00
mm m68k: Replace m68k-specific _[se]bss by generic __bss_{start,stop} 2012-06-27 09:59:43 +02:00
mvme16x Disintegrate asm/system.h for M68K 2012-03-28 18:30:02 +01:00
mvme147 Disintegrate asm/system.h for M68K 2012-03-28 18:30:02 +01:00
platform m68k: Replace m68k-specific _[se]bss by generic __bss_{start,stop} 2012-06-27 09:59:43 +02:00
q40 m68k/q40: Add missing platform check before registering platform devices 2012-04-01 22:57:53 +02:00
sun3 m68k/sun3: Remove unselectable code in prom_init() 2012-06-27 09:59:44 +02:00
sun3x Disintegrate asm/system.h for M68K 2012-03-28 18:30:02 +01:00
tools/amiga
install.sh
Kconfig m68k: Move CPU_HAS_* config options 2012-06-10 10:18:29 +02:00
Kconfig.bus m68k: Revive lost DIO bus config option 2011-11-08 22:35:46 +01:00
Kconfig.cpu m68knommu: Allow ColdFire CPUs to use unaligned accesses 2012-06-27 09:28:50 +02:00
Kconfig.debug Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 2012-01-06 18:28:12 -08:00
Kconfig.devices m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac 2012-01-04 22:23:50 +01:00
Kconfig.machine m68k/Kconfig: Separate classic m68k and coldfire early 2011-12-30 10:20:49 +10:00
Makefile Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 2012-05-21 19:15:03 -07:00