summaryrefslogtreecommitdiff
path: root/kernel/lockdep_internals.h
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2012-07-20 19:54:29 (GMT)
committerGeert Uytterhoeven <geert@linux-m68k.org>2012-07-22 14:55:49 (GMT)
commit1525e06e4414dbe053ea10cbd8cc03bb150e8e27 (patch)
treeeba136290d98b7150ee2bde8293b6619085e0217 /kernel/lockdep_internals.h
parent897f3325a17e17dcdf8f3950a2b83542645902e5 (diff)
downloadlinux-fsl-qoriq-1525e06e4414dbe053ea10cbd8cc03bb150e8e27.tar.xz
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/
Diffstat (limited to 'kernel/lockdep_internals.h')
0 files changed, 0 insertions, 0 deletions