From patchwork Wed Aug 18 09:54:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 62017 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 BB414B70E3 for ; Wed, 18 Aug 2010 19:55:16 +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 1OlfMR-0007o9-GY; Wed, 18 Aug 2010 10:55:07 +0100 Received: from ozlabs.org ([203.10.76.45]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OlfMP-0007mu-64 for kernel-team@lists.ubuntu.com; Wed, 18 Aug 2010 10:55:05 +0100 Received: by ozlabs.org (Postfix, from userid 1023) id 619C5B70E4; Wed, 18 Aug 2010 19:55:03 +1000 (EST) MIME-Version: 1.0 Subject: [PATCH 1/2] UBUNTU: [Config] Unify CONFIG_INPUT_UINPUT Message-Id: <1282125271.46078.516165539912.1.gpush@pororo> To: kernel-team@lists.ubuntu.com From: Jeremy Kerr Date: Wed, 18 Aug 2010 17:54:31 +0800 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 Currently, we define CONFIG_INPUT_UINPUT separately in each of the ports configs. This change removes the arch-specific definitions and replaces with one in config.common.ports. This will only change sparc, which goes from not set to =m. Ignore: yes Signed-off-by: Jeremy Kerr Acked-by: Tim Gardner ? --- debian.master/config/config.common.ports | 1 + debian.master/config/ia64/config.common.ia64 | 1 - debian.master/config/powerpc/config.common.powerpc | 1 - debian.master/config/sparc/config.common.sparc | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports index 775f80c..a983a52 100644 --- a/debian.master/config/config.common.ports +++ b/debian.master/config/config.common.ports @@ -1515,6 +1515,7 @@ CONFIG_INPUT_TWL4030_PWRBUTTON=m CONFIG_INPUT_TWL4030_VIBRA=m CONFIG_INPUT_WM831X_ON=m CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_UINPUT=m CONFIG_IOMMU_API=y CONFIG_IOMMU_HELPER=y CONFIG_IOSAPIC=y diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64 index a25b5ac..5a1836e 100644 --- a/debian.master/config/ia64/config.common.ia64 +++ b/debian.master/config/ia64/config.common.ia64 @@ -119,7 +119,6 @@ CONFIG_INFINIBAND_QIB=m CONFIG_INPUT_EVBUG=m CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y -CONFIG_INPUT_UINPUT=m # CONFIG_IP1000 is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_IPV6_PRIVACY is not set diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 1cde1cb..f05b755 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -107,7 +107,6 @@ CONFIG_INFTL=m CONFIG_INPUT_EVBUG=m CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y -CONFIG_INPUT_UINPUT=m CONFIG_IP1000=m CONFIG_IPMI_HANDLER=m CONFIG_IPMI_POWEROFF=m diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc index 19e0a16..5a16dfc 100644 --- a/debian.master/config/sparc/config.common.sparc +++ b/debian.master/config/sparc/config.common.sparc @@ -119,7 +119,6 @@ CONFIG_INFTL=m # CONFIG_INPUT_EVBUG is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_UINPUT is not set CONFIG_IP1000=m CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_POWEROFF is not set