diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-07-01 07:10:21 +0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-07-01 07:10:21 +0400 |
| commit | 87fa35dd881fd61a2a8166892366f2c22c34a1fa (patch) | |
| tree | c1f80b9287f3e333d66740bbb5189afe8c126e03 /arch/powerpc/include/asm/hvsi.h | |
| parent | 9def247a7076bcced342a9783da79f2e0b0a3f47 (diff) | |
| download | linux-87fa35dd881fd61a2a8166892366f2c22c34a1fa.tar.xz | |
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>
Diffstat (limited to 'arch/powerpc/include/asm/hvsi.h')
| -rw-r--r-- | arch/powerpc/include/asm/hvsi.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/powerpc/include/asm/hvsi.h b/arch/powerpc/include/asm/hvsi.h index 91e0453b3743..d3f64f361814 100644 --- a/arch/powerpc/include/asm/hvsi.h +++ b/arch/powerpc/include/asm/hvsi.h @@ -78,17 +78,17 @@ struct hvsi_priv { /* hvsi lib functions */ struct hvc_struct; -extern void hvsi_init(struct hvsi_priv *pv, - int (*get_chars)(uint32_t termno, char *buf, int count), - int (*put_chars)(uint32_t termno, const char *buf, - int count), - int termno, int is_console); -extern int hvsi_open(struct hvsi_priv *pv, struct hvc_struct *hp); -extern void hvsi_close(struct hvsi_priv *pv, struct hvc_struct *hp); -extern int hvsi_read_mctrl(struct hvsi_priv *pv); -extern int hvsi_write_mctrl(struct hvsi_priv *pv, int dtr); -extern void hvsi_establish(struct hvsi_priv *pv); -extern int hvsi_get_chars(struct hvsi_priv *pv, char *buf, int count); -extern int hvsi_put_chars(struct hvsi_priv *pv, const char *buf, int count); +extern void hvsilib_init(struct hvsi_priv *pv, + int (*get_chars)(uint32_t termno, char *buf, int count), + int (*put_chars)(uint32_t termno, const char *buf, + int count), + int termno, int is_console); +extern int hvsilib_open(struct hvsi_priv *pv, struct hvc_struct *hp); +extern void hvsilib_close(struct hvsi_priv *pv, struct hvc_struct *hp); +extern int hvsilib_read_mctrl(struct hvsi_priv *pv); +extern int hvsilib_write_mctrl(struct hvsi_priv *pv, int dtr); +extern void hvsilib_establish(struct hvsi_priv *pv); +extern int hvsilib_get_chars(struct hvsi_priv *pv, char *buf, int count); +extern int hvsilib_put_chars(struct hvsi_priv *pv, const char *buf, int count); #endif /* _HVSI_H */ |