Benjamin Herrenschmidt 87fa35dd88 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>

2011-07-01 13:10:21 +10:00

..

boot

Merge remote branch 'origin/master' into next

2011-06-30 15:23:59 +10:00

configs

Merge remote branch 'origin/master' into next

2011-06-30 15:23:59 +10:00

include/asm

powerpc/hvsi: Fix conflict with old HVSI driver

2011-07-01 13:10:21 +10:00

kernel

powerpc: Add printk companion for ppc_md.progress

2011-06-30 15:28:05 +10:00

kvm

Merge branch 'kvm-updates/2.6.40' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2011-05-23 08:42:08 -07:00

lib

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2011-05-20 13:28:01 -07:00

math-emu

powerpc/85xx: Fix SPE float to integer conversion failure

2011-03-15 13:48:15 -05:00

mm

powerpc: Add printk companion for ppc_md.progress

2011-06-30 15:28:05 +10:00

oprofile

powerpc/oprofile: Handle events that raise an exception without overflowing

2011-05-26 13:38:57 +10:00

platforms

powerpc: Move free_initmem to common code

2011-06-30 15:28:05 +10:00

sysdev

Merge remote branch 'origin/master' into next

2011-06-30 15:23:59 +10:00

xmon

powerpc: Remove call sites of MSG_ALL_BUT_SELF

2011-05-19 14:30:46 +10:00

Kconfig

arch: remove CONFIG_GENERIC_FIND_{NEXT_BIT,BIT_LE,LAST_BIT}

2011-05-26 17:12:38 -07:00

Kconfig.debug

powerpc/pseries: Re-implement HVSI as part of hvc_vio

2011-06-29 17:48:35 +10:00

Makefile

powerpc: Fix typo in uImage target

2010-08-24 15:26:32 +10:00

relocs_check.pl

powerpc: Check for unsupported relocs when using CONFIG_RELOCATABLE

2009-09-24 15:31:40 +10:00