x86/numachip: Fix timer build conflict
authorDaniel J Blueman <daniel@numascale.com>
Wed, 23 Sep 2015 01:38:13 +0000 (09:38 +0800)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 23 Sep 2015 03:39:20 +0000 (05:39 +0200)
commitef34cc3428a716f86ee72aa5a37fa6c0025e4363
tree66a322a896f42264d11259687c58fa9bc88bde1b
parentce2e572cfe7b2fc3f0e9da4aa7bc61a2c2c51fc7
x86/numachip: Fix timer build conflict

Fix Numachip build conflict from:
ce2e572 x86/numachip: Introduce Numachip2 timer mechanisms

drivers/built-in.o:(.discard+0x1b): multiple definition of `__pcpu_unique_cpu_ced'
arch/x86/built-in.o:(.discard+0xa0da): first defined here

Ensure cpu_ced is unique by prefixing with 'numachip2'.

Signed-off-by: Daniel J Blueman <daniel@numascale.com>
Cc: <tipbuild@zytor.com>
Cc: <kbuild-all@01.org>
Cc: Steffen Persvold <sp@numascale.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
drivers/clocksource/numachip.c
This page took 0.026409 seconds and 5 git commands to generate.