From patchwork Mon Nov 2 21:39:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bob Beers X-Patchwork-Id: 37451 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 20790B7C33 for ; Tue, 3 Nov 2009 08:39:30 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756700AbZKBVjT (ORCPT ); Mon, 2 Nov 2009 16:39:19 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756759AbZKBVjT (ORCPT ); Mon, 2 Nov 2009 16:39:19 -0500 Received: from mail-ew0-f228.google.com ([209.85.219.228]:40935 "EHLO mail-ew0-f228.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756697AbZKBVjS convert rfc822-to-8bit (ORCPT ); Mon, 2 Nov 2009 16:39:18 -0500 Received: by ewy28 with SMTP id 28so5335902ewy.18 for ; Mon, 02 Nov 2009 13:39:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=Lwl3gL64Rl0L8p4z/mQgzeQ7oFRRvwVbxHZxfWW9o4w=; b=AICuZAR1Qq6skxbMW3rUpCFmyHTYIA2zSQoPn9K/soxhylcYzKxVF5jxHOGlReq0O4 0hv5Dnjvsrm02A41nDM9ZEUWJ8+B7XQX6MMO6OQAi97oz/v13Fpkc4Ec5vDoxlCl34Xl ZY8fR3fSpl2/+24oWaH2RB/dET/g9S5+R2OvQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=fjygrRrIcEZHTWOau5dVxa3ZKNTwpIbuKirFYCU/tQ+ACPX7J57WUSzkLhf/Z8kX8N ttlgikAZuANZ/0IGoh98PwbuEU5GGkpprAZL+wagYvQlgBhGrLvCpa+qpkUUBbPgGqe+ ccOsAPjUfqXTmk65LL2a1s2t+bZrT4jXo2KoE= MIME-Version: 1.0 Received: by 10.216.85.143 with SMTP id u15mr5330287wee.205.1257197962613; Mon, 02 Nov 2009 13:39:22 -0800 (PST) In-Reply-To: <4f6ba3b0911021335k3054da38x56fe72ac7ea8781c@mail.gmail.com> References: <4f6ba3b0910261322j273c977fm356506c46f095832@mail.gmail.com> <20091026204144.GA28436@kroah.com> <4f6ba3b0910271048n10ff37fek9af191b133892e1e@mail.gmail.com> <4f6ba3b0911021241gb6d9684ga76228013e0f5f14@mail.gmail.com> <20091102205911.GA23443@kroah.com> <4f6ba3b0911021316v16ff7431s4dfa939743541df6@mail.gmail.com> <4f6ba3b0911021335k3054da38x56fe72ac7ea8781c@mail.gmail.com> Date: Mon, 2 Nov 2009 16:39:22 -0500 Message-ID: <4f6ba3b0911021339v20d7692fm52bcd5208002d6e4@mail.gmail.com> Subject: Re: wanPMC-CxT1E1 From: Bob Beers To: Greg KH Cc: netdev@vger.kernel.org, Krzysztof Halasa Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon, Nov 2, 2009 at 4:35 PM, Bob Beers wrote: > I should be able to fix those things an generate another patch file, >  but my git skills are very weak, so I guess you have the options: >  fix it up by hand, or teach me a little more git, so I can submit >  a better patch. Here is patch on top of previous patch to fix the two mistakes: thanks, diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile index ebc96c7..19d14bc 100644 --- a/drivers/net/wan/Makefile +++ b/drivers/net/wan/Makefile @@ -29,7 +29,6 @@ obj-$(CONFIG_DSCC4) += dscc4.o obj-$(CONFIG_X25_ASY) += x25_asy.o obj-$(CONFIG_LANMEDIA) += lmc/ -obj-$(CONFIG_CXT1E1) += cxt1e1/ obj-$(CONFIG_DLCI) += dlci.o obj-$(CONFIG_SDLA) += sdla.o diff --git a/drivers/staging/cxt1e1/Makefile b/drivers/staging/cxt1e1/Makefile index edfad71..10020d7 100644 --- a/drivers/staging/cxt1e1/Makefile +++ b/drivers/staging/cxt1e1/Makefile @@ -1,4 +1,3 @@ -CONFIG_CXT1E1 = m obj-$(CONFIG_CXT1E1) += cxt1e1.o EXTRA_CFLAGS += -DSBE_PMCC4_ENABLE