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

..

hvc

powerpc/hvsi: Fix conflict with old HVSI driver

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

ipwireless

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

2011-05-24 13:28:35 -07:00

serial

Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

2011-06-28 11:14:55 -07:00

vt

Revert "tty: make receive_buf() return the amout of bytes received"

2011-06-04 06:33:24 +09:00

amiserial.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

bfin_jtag_comm.c

drivers/tty/bfin_jtag_comm.c: avoid calling put_tty_driver on NULL

2011-03-23 19:46:39 -07:00

cyclades.c

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

2011-05-26 13:19:00 -07:00

isicom.c

…

Kconfig

n_tracerouter and n_tracesink ldisc additions.

2011-05-13 16:31:00 -07:00

Makefile

n_tracerouter and n_tracesink ldisc additions.

2011-05-13 16:31:00 -07:00

moxa.c

drivers/tty/moxa.c: Put correct tty value

2011-04-29 14:17:45 -07:00

moxa.h

…

mxser.c

…

mxser.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

n_gsm.c

tty: n_gsm: improper skb_pull() use was leaking framed data

2011-06-16 12:00:15 -07:00

n_hdlc.c

Revert "tty: make receive_buf() return the amout of bytes received"

2011-06-04 06:33:24 +09:00

n_r3964.c

Revert "tty: make receive_buf() return the amout of bytes received"

2011-06-04 06:33:24 +09:00

n_tracerouter.c

n_tracerouter and n_tracesink ldisc additions.

2011-05-13 16:31:00 -07:00

n_tracesink.c

n_tracerouter and n_tracesink ldisc additions.

2011-05-13 16:31:00 -07:00

n_tracesink.h

n_tracerouter and n_tracesink ldisc additions.

2011-05-13 16:31:00 -07:00

n_tty.c

TTY: ntty, add one more sanity check

2011-06-07 10:36:47 -07:00

nozomi.c

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

2011-05-26 13:19:00 -07:00

pty.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

rocket_int.h

…

rocket.c

TTY: rocket, remove unused variables

2011-04-19 14:41:48 -07:00

rocket.h

…

synclink_gt.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

synclink.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

synclinkmp.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

sysrq.c

lib, arch: add filter argument to show_mem and fix private implementations

2011-03-24 17:49:37 -07:00

tty_audit.c

…

tty_buffer.c

tty_buffer: get rid of 'seen_tail' logic in flush_to_ldisc

2011-06-08 07:46:30 -07:00

tty_io.c

TTY: tty_io, annotate locking functions

2011-04-25 14:19:12 -07:00

tty_ioctl.c

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

2011-05-23 12:23:20 -07:00

tty_ldisc.c

TTY: ldisc, do not close until there are readers

2011-06-07 10:16:54 -07:00

tty_mutex.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

tty_port.c

…