From patchwork Mon Apr 2 19:29:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 150235 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 B6408B6FC3 for ; Tue, 3 Apr 2012 05:29:45 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SEmwb-00077h-Vm; Mon, 02 Apr 2012 19:29:38 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SEmwZ-00075T-Gv for kernel-team@lists.ubuntu.com; Mon, 02 Apr 2012 19:29:35 +0000 Received: from 2-230-238-136.ip204.fastwebnet.it ([2.230.238.136] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SEmwZ-0001a3-EA for kernel-team@lists.ubuntu.com; Mon, 02 Apr 2012 19:29:35 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/7] UBUNTU: [Config] Sync core subsys with master (ATA and HID) Date: Mon, 2 Apr 2012 21:29:26 +0200 Message-Id: <1333394973-14387-2-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1333394973-14387-1-git-send-email-paolo.pisati@canonical.com> References: <1333394973-14387-1-git-send-email-paolo.pisati@canonical.com> 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 Signed-off-by: Paolo Pisati --- debian.ti-omap4/config/config.common.ubuntu | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu index 4023d09..c9a24a4 100644 --- a/debian.ti-omap4/config/config.common.ubuntu +++ b/debian.ti-omap4/config/config.common.ubuntu @@ -207,7 +207,7 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_TX_DMA=y CONFIG_ASYNC_XOR=m CONFIG_AT76C50X_USB=m -CONFIG_ATA=m +CONFIG_ATA=y CONFIG_ATAGS_PROC=y CONFIG_ATALK=m CONFIG_ATARI_PARTITION=y @@ -1147,7 +1147,7 @@ CONFIG_HERMES_CACHE_FW_ON_INIT=y # CONFIG_HERMES_PRISM is not set CONFIG_HFSPLUS_FS=m CONFIG_HFS_FS=m -CONFIG_HID=y +CONFIG_HID=m CONFIG_HIDRAW=y CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m