From patchwork Tue Dec 17 15:48:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salter X-Patchwork-Id: 3362461 X-Patchwork-Delegate: lethal@linux-sh.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B1B2D9F344 for ; Tue, 17 Dec 2013 15:52:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E9183201F0 for ; Tue, 17 Dec 2013 15:51:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA6E9203A3 for ; Tue, 17 Dec 2013 15:51:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754751Ab3LQPvi (ORCPT ); Tue, 17 Dec 2013 10:51:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35914 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754789Ab3LQPvf (ORCPT ); Tue, 17 Dec 2013 10:51:35 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rBHFnuGj011843 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 17 Dec 2013 10:49:57 -0500 Received: from deneb.redhat.com (ovpn-113-103.phx2.redhat.com [10.3.113.103]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rBHFn9B0022379; Tue, 17 Dec 2013 10:49:54 -0500 From: Mark Salter To: linux-kernel@vger.kernel.org Cc: Mark Salter , Dmitry Torokhov , Richard Henderson , linux-alpha@vger.kernel.org, Russell King , linux-arm-kernel@lists.infradead.org, Tony Luck , Fenghua Yu , linux-ia64@vger.kernel.org, linux-mips@linux-mips.org, Paul Mackerras , linuxppc-dev@lists.ozlabs.org, Paul Mundt , linux-sh@vger.kernel.org, "David S. Miller" , sparclinux@vger.kernel.org, Guan Xuetao , Ingo Molnar , Thomas Gleixner , x86@kernel.org Subject: [PATCH v2 10/10] Kconfig: cleanup SERIO_I8042 dependencies Date: Tue, 17 Dec 2013 10:48:53 -0500 Message-Id: <1387295333-24684-11-git-send-email-msalter@redhat.com> In-Reply-To: <1387295333-24684-1-git-send-email-msalter@redhat.com> References: <1387295333-24684-1-git-send-email-msalter@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove messy dependencies from SERIO_I8042 by having it depend on one Kconfig symbol (ARCH_MIGHT_HAVE_PC_SERIO) and having architectures which need it select ARCH_MIGHT_HAVE_PC_SERIO in arch/*/Kconfig. New architectures are unlikely to need SERIO_I8042, so this avoids having an ever growing list of architectures to exclude. Signed-off-by: Mark Salter Acked-by: "H. Peter Anvin" Acked-by: Ralf Baechle Acked-by: Benjamin Herrenschmidt CC: Dmitry Torokhov CC: Richard Henderson CC: linux-alpha@vger.kernel.org CC: Russell King CC: linux-arm-kernel@lists.infradead.org CC: Tony Luck CC: Fenghua Yu CC: linux-ia64@vger.kernel.org CC: linux-mips@linux-mips.org CC: Paul Mackerras CC: linuxppc-dev@lists.ozlabs.org CC: Paul Mundt CC: linux-sh@vger.kernel.org CC: "David S. Miller" CC: sparclinux@vger.kernel.org CC: Guan Xuetao CC: Ingo Molnar CC: Thomas Gleixner CC: x86@kernel.org --- drivers/input/serio/Kconfig | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index 8541f94..1f5cec2 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig @@ -16,14 +16,19 @@ config SERIO To compile this driver as a module, choose M here: the module will be called serio. +config ARCH_MIGHT_HAVE_PC_SERIO + bool + help + Select this config option from the architecture Kconfig if + the architecture might use a PC serio device (i8042) to + communicate with keyboard, mouse, etc. + if SERIO config SERIO_I8042 tristate "i8042 PC Keyboard controller" default y - depends on !PARISC && (!ARM || FOOTBRIDGE_HOST) && \ - (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !S390 && \ - !ARC + depends on ARCH_MIGHT_HAVE_PC_SERIO help i8042 is the chip over which the standard AT keyboard and PS/2 mouse are connected to the computer. If you use these devices,