projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9def247) | patch
powerpc/hvsi: Fix conflict with old HVSI driver
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 1 Jul 2011 03:10:21 +0000 (13:10 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 1 Jul 2011 03:10:21 +0000 (13:10 +1000)
commit87fa35dd881fd61a2a8166892366f2c22c34a1fa
treec1f80b9287f3e333d66740bbb5189afe8c126e03tree | snapshot (tar.gz zip)
parent9def247a7076bcced342a9783da79f2e0b0a3f47commit | diff
powerpc/hvsi: Fix conflict with old HVSI driver

A mix of think & mismerge on my side caused a problem where both the
new hvsi_lib and the old hvsi driver gets compiled and try to define
symbols with the same name.

This fixes it by renaming the hvsi_lib exported symbols.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/include/asm/hvsi.h diff | blob | blame | history
drivers/tty/hvc/hvc_vio.c diff | blob | blame | history
drivers/tty/hvc/hvsi_lib.c diff | blob | blame | history