From patchwork Tue Sep 3 13:40:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 2853236 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 24815C0AB5 for ; Tue, 3 Sep 2013 13:40:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8312C20107 for ; Tue, 3 Sep 2013 13:40:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FAE7200D5 for ; Tue, 3 Sep 2013 13:40:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932886Ab3ICNkJ (ORCPT ); Tue, 3 Sep 2013 09:40:09 -0400 Received: from mail-wg0-f41.google.com ([74.125.82.41]:60681 "EHLO mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932823Ab3ICNkI (ORCPT ); Tue, 3 Sep 2013 09:40:08 -0400 Received: by mail-wg0-f41.google.com with SMTP id a12so1275234wgh.0 for ; Tue, 03 Sep 2013 06:40:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2hTRcvg4b4FgdnOE97PdwiUjoqReSNpI3NzO38cmQ2s=; b=kHLtcCitdOmGkLBmcn7P14CK/EDfefb2qxask8JqDBfysdEFLhqw7Iz2aHXYJ82yuw T6SeV2ELMyqdKwtLo4e9Tt+kZinCRJdjdIMtlplKjlaXR3BabfV+ERLbCom0HoVEw1H+ elmOsWMpXV6VKDor8eb5RmkRYzcl76RpV/l3qryLv50SQlAaDh1ESiEvmC4hq1TYmNPY URTbhXxkAN+HoXUVdy1TtSSWgp1w6B+GIQjH7wvULksAy39PQhnARySdNAL1PLDxkcLj b06FpdL34MJACv8Cf7cJaGiKgEkxgnB76f/GQKh8yOD4gThLeKQrsjLvJWuTSsb1LPch 5ZCA== X-Gm-Message-State: ALoCoQke+x1DsoT/lQtsWhajS3r9rgFb9PY7wPzd6QV9fCxhMauap0R2D/1JRq257IPqU8J9buWU X-Received: by 10.180.160.229 with SMTP id xn5mr18204317wib.62.1378215607121; Tue, 03 Sep 2013 06:40:07 -0700 (PDT) Received: from localhost.localdomain (ip-189.net-89-2-206.rev.numericable.fr. [89.2.206.189]) by mx.google.com with ESMTPSA id i12sm25409208wiw.3.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Sep 2013 06:40:06 -0700 (PDT) From: Tom Gundersen To: linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Tom Gundersen , Dmitry Torokhov Subject: [PATCH 1/2] input: allow SERIO=m even without EXPERT=y Date: Tue, 3 Sep 2013 15:40:55 +0200 Message-Id: <1378215656-11827-1-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.8.4 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 There is plenty of consumer hardware (e.g., mac books) that does not use AT keyboards or PS/2 mice. It therefore makes sense for distro kernels to build the related drivers as modules to avoid loading them on hardware that does not need them. As such, these options should no longer be protected by EXPERT. Moreover, building these drivers as modules gets rid of the following ugly error during boot: [ 2.337745] i8042: PNP: No PS/2 controller found. Probing ports directly. [ 3.439537] i8042: No controller found Signed-off-by: Tom Gundersen Cc: Dmitry Torokhov --- drivers/input/keyboard/Kconfig | 4 ++-- drivers/input/serio/Kconfig | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 269d4c3..2d31cec 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -2,7 +2,7 @@ # Input core configuration # menuconfig INPUT_KEYBOARD - bool "Keyboards" if EXPERT || !X86 + bool "Keyboards" default y help Say Y here, and a list of supported keyboards will be displayed. @@ -67,7 +67,7 @@ config KEYBOARD_ATARI module will be called atakbd. config KEYBOARD_ATKBD - tristate "AT keyboard" if EXPERT || !X86 + tristate "AT keyboard" default y select SERIO select SERIO_LIBPS2 diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index 1e691a3..39c869d 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig @@ -2,7 +2,7 @@ # Input core configuration # config SERIO - tristate "Serial I/O support" if EXPERT || !X86 + tristate "Serial I/O support" default y help Say Yes here if you have any input device that uses serial I/O to @@ -19,7 +19,7 @@ config SERIO if SERIO config SERIO_I8042 - tristate "i8042 PC Keyboard controller" if EXPERT || !X86 + tristate "i8042 PC Keyboard controller" default y depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \ (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !S390 && \ @@ -170,7 +170,7 @@ config SERIO_MACEPS2 module will be called maceps2. config SERIO_LIBPS2 - tristate "PS/2 driver library" if EXPERT + tristate "PS/2 driver library" depends on SERIO_I8042 || SERIO_I8042=n help Say Y here if you are using a driver for device connected