| Message ID | 20100317211231.569B140118@xenon.ts.pxnet.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Tilman Schmidt <tilman@imap.cc> Date: Wed, 17 Mar 2010 18:37:05 +0100 > Update the dummy LL interface to the LL interface change > introduced by commit daab433c03c15fd642c71c94eb51bdd3f32602c8. > This fixes the build failure occurring after that commit when > enabling ISDN_DRV_GIGASET but neither ISDN_I4L nor ISDN_CAPI. > > Impact: bugfix > Signed-off-by: Tilman Schmidt <tilman@imap.cc> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 03/17/10 10:37, Tilman Schmidt wrote: > Update the dummy LL interface to the LL interface change > introduced by commit daab433c03c15fd642c71c94eb51bdd3f32602c8. > This fixes the build failure occurring after that commit when > enabling ISDN_DRV_GIGASET but neither ISDN_I4L nor ISDN_CAPI. > > Impact: bugfix > Signed-off-by: Tilman Schmidt <tilman@imap.cc> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Thanks. > --- > drivers/isdn/gigaset/dummyll.c | 14 +++++++++++--- > 1 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/drivers/isdn/gigaset/dummyll.c b/drivers/isdn/gigaset/dummyll.c > index 5b27c99..bd0b1ea 100644 > --- a/drivers/isdn/gigaset/dummyll.c > +++ b/drivers/isdn/gigaset/dummyll.c > @@ -57,12 +57,20 @@ void gigaset_isdn_stop(struct cardstate *cs) > { > } > > -int gigaset_isdn_register(struct cardstate *cs, const char *isdnid) > +int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid) > { > - pr_info("no ISDN subsystem interface\n"); > return 1; > } > > -void gigaset_isdn_unregister(struct cardstate *cs) > +void gigaset_isdn_unregdev(struct cardstate *cs) > +{ > +} > + > +void gigaset_isdn_regdrv(void) > +{ > + pr_info("no ISDN subsystem interface\n"); > +} > + > +void gigaset_isdn_unregdrv(void) > { > }
diff --git a/drivers/isdn/gigaset/dummyll.c b/drivers/isdn/gigaset/dummyll.c index 5b27c99..bd0b1ea 100644 --- a/drivers/isdn/gigaset/dummyll.c +++ b/drivers/isdn/gigaset/dummyll.c @@ -57,12 +57,20 @@ void gigaset_isdn_stop(struct cardstate *cs) { } -int gigaset_isdn_register(struct cardstate *cs, const char *isdnid) +int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid) { - pr_info("no ISDN subsystem interface\n"); return 1; } -void gigaset_isdn_unregister(struct cardstate *cs) +void gigaset_isdn_unregdev(struct cardstate *cs) +{ +} + +void gigaset_isdn_regdrv(void) +{ + pr_info("no ISDN subsystem interface\n"); +} + +void gigaset_isdn_unregdrv(void) { }
Update the dummy LL interface to the LL interface change introduced by commit daab433c03c15fd642c71c94eb51bdd3f32602c8. This fixes the build failure occurring after that commit when enabling ISDN_DRV_GIGASET but neither ISDN_I4L nor ISDN_CAPI. Impact: bugfix Signed-off-by: Tilman Schmidt <tilman@imap.cc> --- drivers/isdn/gigaset/dummyll.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-)