summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/mISDN/core.h
diff options
context:
space:
mode:
authorwolfgang huang <huangjinhui@kylinos.cn>2021-12-28 16:01:20 +0800
committerDavid S. Miller <davem@davemloft.net>2021-12-28 12:12:04 +0000
commit8b5fdfc57cc2471179d1c51081424ded833c16c8 (patch)
tree07fcbb421f1b990a1e5a4cb8cfd0c6c96e3348bc /drivers/isdn/mISDN/core.h
parent79b69a83705e621b258ac6d8ae6d3bfdb4b930aa (diff)
downloadlinux-8b5fdfc57cc2471179d1c51081424ded833c16c8.tar.bz2
mISDN: change function names to avoid conflicts
As we build for mips, we meet following error. l1_init error with multiple definition. Some architecture devices usually marked with l1, l2, lxx as the start-up phase. so we change the mISDN function names, align with Isdnl2_xxx. mips-linux-gnu-ld: drivers/isdn/mISDN/layer1.o: in function `l1_init': (.text+0x890): multiple definition of `l1_init'; \ arch/mips/kernel/bmips_5xxx_init.o:(.text+0xf0): first defined here make[1]: *** [home/mips/kernel-build/linux/Makefile:1161: vmlinux] Error 1 Signed-off-by: wolfgang huang <huangjinhui@kylinos.cn> Reported-by: k2ci <kernel-bot@kylinos.cn> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/mISDN/core.h')
-rw-r--r--drivers/isdn/mISDN/core.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/mISDN/core.h b/drivers/isdn/mISDN/core.h
index 23b44d303327..42599f49c189 100644
--- a/drivers/isdn/mISDN/core.h
+++ b/drivers/isdn/mISDN/core.h
@@ -60,8 +60,8 @@ struct Bprotocol *get_Bprotocol4id(u_int);
extern int mISDN_inittimer(u_int *);
extern void mISDN_timer_cleanup(void);
-extern int l1_init(u_int *);
-extern void l1_cleanup(void);
+extern int Isdnl1_Init(u_int *);
+extern void Isdnl1_cleanup(void);
extern int Isdnl2_Init(u_int *);
extern void Isdnl2_cleanup(void);