diff options
| author | wolfgang huang <huangjinhui@kylinos.cn> | 2021-12-28 16:01:20 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-12-28 12:12:04 +0000 |
| commit | 8b5fdfc57cc2471179d1c51081424ded833c16c8 (patch) | |
| tree | 07fcbb421f1b990a1e5a4cb8cfd0c6c96e3348bc /drivers/isdn/mISDN/layer1.c | |
| parent | 79b69a83705e621b258ac6d8ae6d3bfdb4b930aa (diff) | |
| download | linux-stable-8b5fdfc57cc2471179d1c51081424ded833c16c8.tar.gz linux-stable-8b5fdfc57cc2471179d1c51081424ded833c16c8.tar.bz2 linux-stable-8b5fdfc57cc2471179d1c51081424ded833c16c8.zip | |
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/layer1.c')
| -rw-r--r-- | drivers/isdn/mISDN/layer1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/mISDN/layer1.c b/drivers/isdn/mISDN/layer1.c index 98a3bc6c1700..7b31c25a550e 100644 --- a/drivers/isdn/mISDN/layer1.c +++ b/drivers/isdn/mISDN/layer1.c @@ -398,7 +398,7 @@ create_l1(struct dchannel *dch, dchannel_l1callback *dcb) { EXPORT_SYMBOL(create_l1); int -l1_init(u_int *deb) +Isdnl1_Init(u_int *deb) { debug = deb; l1fsm_s.state_count = L1S_STATE_COUNT; @@ -409,7 +409,7 @@ l1_init(u_int *deb) } void -l1_cleanup(void) +Isdnl1_cleanup(void) { mISDN_FsmFree(&l1fsm_s); } |