From patchwork Mon Apr 2 19:29:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 150237 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 00FF8B6EEB for ; Tue, 3 Apr 2012 05:29:48 +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 1SEmwe-00079d-37; Mon, 02 Apr 2012 19:29:40 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SEmwb-00077n-Su for kernel-team@lists.ubuntu.com; Mon, 02 Apr 2012 19:29:38 +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 1SEmwb-0001aF-P2 for kernel-team@lists.ubuntu.com; Mon, 02 Apr 2012 19:29:37 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/7] UBUNTU: [Config] Sync HID drivers with master Date: Mon, 2 Apr 2012 21:29:29 +0200 Message-Id: <1333394973-14387-5-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 | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu index c6ff06f..c17da9d 100644 --- a/debian.ti-omap4/config/config.common.ubuntu +++ b/debian.ti-omap4/config/config.common.ubuntu @@ -1151,26 +1151,26 @@ CONFIG_HID=m CONFIG_HIDRAW=y CONFIG_HID_A4TECH=m CONFIG_HID_ACRUX=m -# CONFIG_HID_ACRUX_FF is not set +CONFIG_HID_ACRUX_FF=y CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m -# CONFIG_HID_ELECOM is not set +CONFIG_HID_ELECOM=m CONFIG_HID_EMS_FF=m CONFIG_HID_EZKEY=m CONFIG_HID_GREENASIA=m CONFIG_HID_GYRATION=m -# CONFIG_HID_HOLTEK is not set +CONFIG_HID_HOLTEK=m CONFIG_HID_KENSINGTON=m CONFIG_HID_KEYTOUCH=m CONFIG_HID_KYE=m CONFIG_HID_LCPOWER=m CONFIG_HID_LOGITECH=m CONFIG_HID_LOGITECH_DJ=m -# CONFIG_HID_MAGICMOUSE is not set +CONFIG_HID_MAGICMOUSE=m CONFIG_HID_MICROSOFT=m CONFIG_HID_MONTEREY=m CONFIG_HID_MULTITOUCH=m @@ -1184,7 +1184,7 @@ CONFIG_HID_PICOLCD_FB=y CONFIG_HID_PICOLCD_LCD=y CONFIG_HID_PICOLCD_LEDS=y CONFIG_HID_PID=y -# CONFIG_HID_PRIMAX is not set +CONFIG_HID_PRIMAX=m CONFIG_HID_PRODIKEYS=m CONFIG_HID_QUANTA=m CONFIG_HID_ROCCAT=m @@ -1197,7 +1197,7 @@ CONFIG_HID_ROCCAT_PYRA=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SMARTJOYPLUS=m CONFIG_HID_SONY=m -# CONFIG_HID_SPEEDLINK is not set +CONFIG_HID_SPEEDLINK=m CONFIG_HID_SUNPLUS=m CONFIG_HID_SUPPORT=y CONFIG_HID_THRUSTMASTER=m @@ -1207,7 +1207,7 @@ CONFIG_HID_UCLOGIC=m CONFIG_HID_WACOM=m CONFIG_HID_WACOM_POWER_SUPPLY=y CONFIG_HID_WALTOP=m -# CONFIG_HID_WIIMOTE is not set +CONFIG_HID_WIIMOTE=m CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGHMEM=y @@ -1239,6 +1239,7 @@ CONFIG_HISAX_SEDLBAUER_CS=m CONFIG_HISAX_ST5481=m CONFIG_HISAX_TELES_CS=m CONFIG_HMC6352=m +CONFIG_HOLTEK_FF=y CONFIG_HOSTAP=y CONFIG_HOSTAP_CS=m CONFIG_HOSTAP_FIRMWARE=y