From patchwork Thu Nov 10 19:33:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 124990 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 B30DF1007D1 for ; Fri, 11 Nov 2011 06:33:32 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1ROaND-00040m-UI; Thu, 10 Nov 2011 19:33:19 +0000 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1ROaNB-00040V-Tr for kernel-team@lists.ubuntu.com; Thu, 10 Nov 2011 19:33:18 +0000 Received: from lochsa.rtg.net (mail.tpi.com [70.99.223.143]) by mail.tpi.com (Postfix) with ESMTP id 117B82FB082; Thu, 10 Nov 2011 11:32:11 -0800 (PST) Received: by lochsa.rtg.net (Postfix, from userid 1000) id 3F26D31B51; Thu, 10 Nov 2011 12:33:13 -0700 (MST) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Config] CONFIG_MEMSTICK_R592=m Date: Thu, 10 Nov 2011 12:33:01 -0700 Message-Id: <1320953581-19672-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.7.0.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/238208 Signed-off-by: Tim Gardner Acked-by: Leann Ogasawara --- debian.master/config/config.common.ubuntu | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index a7029fa..8c82e72 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2918,7 +2918,7 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set CONFIG_MEMSTICK_JMICRON_38X=m -# CONFIG_MEMSTICK_R592 is not set +CONFIG_MEMSTICK_R592=m CONFIG_MEMSTICK_TIFM_MS=m # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # CONFIG_MEMTEST is not set