From patchwork Fri May 21 23:17:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 53217 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 7AC9FB7D2F for ; Sat, 22 May 2010 09:18:00 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OFbTY-0004nh-Dc; Sat, 22 May 2010 00:17:56 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OFbTX-0004nb-2s for kernel-team@lists.ubuntu.com; Sat, 22 May 2010 00:17:55 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OFbTX-0008N5-1g for ; Sat, 22 May 2010 00:17:55 +0100 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.4]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OFbTW-0006hc-Ka for kernel-team@lists.ubuntu.com; Sat, 22 May 2010 00:17:55 +0100 Subject: [PATCH 02/13] Revert "UBUNTU: [Config] staging/winbond -- disable" From: Leann Ogasawara To: kernel-team In-Reply-To: <1274483333.19284.3264.camel@emiko> References: <1274483333.19284.3264.camel@emiko> Date: Fri, 21 May 2010 16:17:32 -0700 Message-ID: <1274483852.19284.3319.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com >From d55161a42a456103468c74bf927717b75f0f764d Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Fri, 21 May 2010 14:23:15 -0700 Subject: [PATCH 02/13] Revert "UBUNTU: [Config] staging/winbond -- disable" This reverts commit 04c9539494304c2c2c06deda82f2341089319aa7. This was temporarily disabled in the early Lucid cycle due to FTBS issues. Re-enable for Maverick. Signed-off-by: Leann Ogasawara --- drivers/staging/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 2e7fea2..ea2e70e 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -8,7 +8,7 @@ obj-$(CONFIG_SLICOSS) += slicoss/ obj-$(CONFIG_VIDEO_GO7007) += go7007/ obj-$(CONFIG_VIDEO_CX25821) += cx25821/ obj-$(CONFIG_USB_IP_COMMON) += usbip/ -#obj-$(CONFIG_W35UND) += winbond/ +obj-$(CONFIG_W35UND) += winbond/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_ECHO) += echo/ obj-$(CONFIG_POCH) += poch/