Patchwork [02/13] Revert "UBUNTU: [Config] staging/winbond -- disable"

login
register
mail settings
Submitter Leann Ogasawara
Date May 21, 2010, 11:17 p.m.
Message ID <1274483852.19284.3319.camel@emiko>
Download mbox | patch
Permalink /patch/53217/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Leann Ogasawara - May 21, 2010, 11:17 p.m.
>From d55161a42a456103468c74bf927717b75f0f764d Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
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 <leann.ogasawara@canonical.com>
---
 drivers/staging/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

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/