From patchwork Wed Mar 17 17:37:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tilman Schmidt X-Patchwork-Id: 47970 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 27E4CB7CEE for ; Thu, 18 Mar 2010 08:17:13 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755140Ab0CQVQt (ORCPT ); Wed, 17 Mar 2010 17:16:49 -0400 Received: from mail.pxnet.com ([195.227.45.7]:49662 "EHLO mail.pxnet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752779Ab0CQVQs (ORCPT ); Wed, 17 Mar 2010 17:16:48 -0400 Received: from xenon.ts.pxnet.com ([10.8.0.10]) (user=ts author=<> mech=DIGEST-MD5 bits=0) by mail.pxnet.com (8.13.8/8.13.8) with ESMTP id o2HLF895017130 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 17 Mar 2010 22:15:11 +0100 Received: by xenon.ts.pxnet.com (Postfix, from userid 1000) id 569B140118; Wed, 17 Mar 2010 22:12:31 +0100 (CET) From: Tilman Schmidt Date: Wed, 17 Mar 2010 18:37:05 +0100 Subject: [PATCH] gigaset: fix build failure To: Karsten Keil , David Miller CC: Randy Dunlap , Stephen Rothwell , linux-next@vger.kernel.org, Hansjoerg Lipp , isdn4linux , i4ldeveloper , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@kernel.org Message-Id: <20100317211231.569B140118@xenon.ts.pxnet.com> X-Spam-Score: -1.527 () AWL,BAYES_00,DATE_IN_PAST_03_06,RDNS_NONE X-Scanned-By: MIMEDefang 2.67 on 195.227.45.7 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Acked-by: Randy Dunlap --- 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) { }