diff options
| author | David S. Miller <davem@davemloft.net> | 2016-01-11 23:55:43 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-11 23:55:43 -0500 |
| commit | 9d367eddf363553c7668ba92c3b9d187ec4f71f7 (patch) | |
| tree | 4f06d334d316390cc9a869ce3e74ec48d32ed0f8 /drivers/isdn | |
| parent | b6a0e72ad3cffabaf30b856deb58fbe64a0f36a8 (diff) | |
| parent | 03d84a5f83a67e692af00a3d3901e7820e3e84d5 (diff) | |
| download | linux-9d367eddf363553c7668ba92c3b9d187ec4f71f7.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/ethernet/mellanox/mlxsw/spectrum.h
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
The bond_main.c and mellanox switch conflicts were cases of
overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/act2000/module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/act2000/module.c b/drivers/isdn/act2000/module.c index c3a1b061838d..68073d0da0e3 100644 --- a/drivers/isdn/act2000/module.c +++ b/drivers/isdn/act2000/module.c @@ -37,7 +37,7 @@ MODULE_DESCRIPTION("ISDN4Linux: Driver for IBM Active 2000 ISDN card"); MODULE_AUTHOR("Fritz Elfert"); MODULE_LICENSE("GPL"); MODULE_PARM_DESC(act_bus, "BusType of first card, 1=ISA, 2=MCA, 3=PCMCIA, currently only ISA"); -MODULE_PARM_DESC(membase, "Base port address of first card"); +MODULE_PARM_DESC(act_port, "Base port address of first card"); MODULE_PARM_DESC(act_irq, "IRQ of first card"); MODULE_PARM_DESC(act_id, "ID-String of first card"); module_param(act_bus, int, 0); |