From patchwork Thu Jul 15 23:27:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Johansen X-Patchwork-Id: 59051 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 720B6B7085 for ; Fri, 16 Jul 2010 09:29:25 +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 1OZXrk-0007Im-BO; Fri, 16 Jul 2010 00:29:20 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OZXri-0007IW-9c for kernel-team@lists.ubuntu.com; Fri, 16 Jul 2010 00:29:18 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OZXri-00029N-7X; Fri, 16 Jul 2010 00:29:18 +0100 Received: from [96.225.230.137] (helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1OZXrh-0004c9-Se; Fri, 16 Jul 2010 00:29:18 +0100 From: John Johansen To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Config] Enable DRBD as a module Date: Thu, 15 Jul 2010 16:27:38 -0700 Message-Id: <1279236458-20728-2-git-send-email-john.johansen@canonical.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1279236458-20728-1-git-send-email-john.johansen@canonical.com> References: <1279236458-20728-1-git-send-email-john.johansen@canonical.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: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com DRBD used to be supported via DKMS but now that it is upstream enable it as a module. Signed-off-by: John Johansen --- debian.master/config/config.common.ubuntu | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index fdee92e..eb18f85 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -423,7 +423,7 @@ CONFIG_BLK_DEV_COMPCACHE=m CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_DM=y -# CONFIG_BLK_DEV_DRBD is not set +CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y @@ -1032,6 +1032,7 @@ CONFIG_DNOTIFY=y CONFIG_DONGLE=y CONFIG_DOUBLEFAULT=y CONFIG_DRAGONRISE_FF=y +# CONFIG_DRBD_FAULT_INJECTION is not set CONFIG_DRM=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I810=m @@ -2406,6 +2407,7 @@ CONFIG_LOGITECH_FF=y CONFIG_LP486E=m CONFIG_LPC_SCH=m # CONFIG_LP_CONSOLE is not set +CONFIG_LRU_CACHE=m CONFIG_LSI_ET1011C_PHY=y CONFIG_LSM_MMAP_MIN_ADDR=0 CONFIG_LTPC=m