From patchwork Fri Apr 16 17:17:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 50345 X-Patchwork-Delegate: apw@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 75C7EB7D2E for ; Sat, 17 Apr 2010 03:18:08 +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 1O2pB4-0000AM-Sq; Fri, 16 Apr 2010 18:18:02 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O2pB2-0000A8-7y for kernel-team@lists.ubuntu.com; Fri, 16 Apr 2010 18:18:00 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1O2pB2-0008Qq-49; Fri, 16 Apr 2010 18:18:00 +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 1O2pB1-0004i9-N2; Fri, 16 Apr 2010 18:18:00 +0100 Subject: [Lucid] [Patch 1/1] SRU: Re-enable comedi drivers From: Leann Ogasawara To: kernel-team Date: Fri, 16 Apr 2010 10:17:56 -0700 Message-ID: <1271438276.30561.111.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Cc: berndporr@f2s.com 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 Hi All, https://bugs.launchpad.net/ubuntu/+source/linux/+bug/563436 SRU Justification/Impact: It seems the comedi staging drivers were disabled in Lucid. This is a regression from Karmic. I'm not sure why these were disabled, so if someone has a good reason for them to remain disabled please speak up. Per the request of the usbdux maintainer, I've re-enabled comedi by reverting the patch which disabled it. I recognize we are frozen for the upcoming release so please consider this for the first Lucid Stable Release Update. TEST CASE: I've built a test kernel which re-enables comedi and have received confirmation from the bug reporter (usbdux maintainer) that this indeed provides the comedi drivers. Acked-by: Andy Whitcroft Acked-by: Colin King ===== The following changes since commit 5ffb75e7dd3b8b15a3957c24895e7c02d876fe0f: Andy Whitcroft (1): UBUNTU: Ubuntu-2.6.32-21.32 are available in the git repository at: git://kernel.ubuntu.com/ogasawara/ubuntu-lucid.git lp563436 Leann Ogasawara (1): Revert "UBUNTU: staging/comdi -- disable" drivers/staging/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) >From c2cd04d7aea14bd09bf34126cf916566374132e7 Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Thu, 15 Apr 2010 13:20:11 -0700 Subject: [PATCH] Revert "UBUNTU: staging/comdi -- disable" BugLink: http://bugs.launchpad.net/bugs/563436 The usbdux author/maintainer has requested that comedi be re-enabled. This reverts commit 1db11be784cdb22018c240b40bbe869658b5534c. 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 6f88cb2..3345153 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -16,7 +16,7 @@ obj-$(CONFIG_OTUS) += otus/ obj-$(CONFIG_RT2860) += rt2860/ obj-$(CONFIG_RT2870) += rt2870/ obj-$(CONFIG_RT3090) += rt3090/ -#obj-$(CONFIG_COMEDI) += comedi/ +obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_ASUS_OLED) += asus_oled/ obj-$(CONFIG_PANEL) += panel/ obj-$(CONFIG_ALTERA_PCIE_CHDMA) += altpciechdma/