From patchwork Mon Sep 2 18:47:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 2852954 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 A19CFC0AB5 for ; Mon, 2 Sep 2013 18:46:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C1B202012D for ; Mon, 2 Sep 2013 18:46:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EBB82201F3 for ; Mon, 2 Sep 2013 18:46:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758750Ab3IBSq0 (ORCPT ); Mon, 2 Sep 2013 14:46:26 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:48912 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758718Ab3IBSqZ (ORCPT ); Mon, 2 Sep 2013 14:46:25 -0400 Received: by mail-wg0-f48.google.com with SMTP id c11so3965156wgh.27 for ; Mon, 02 Sep 2013 11:46:24 -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=iqDrfpt7h/W+rZYiiZOp3W+yKAc3WxObgTPJe0ro6OTC5CJtkk59OUwFpIWDx4G/jQ iAcgwxE4ibaUIo0JYxdALEOZHZtLGRKzkqEozmsoRmSVJK5k4u8jtpkg9QIfPKZVcPXY 8P+STINSu6VVieW55f/B57mAofrdAevuJDaG1a+pX+zh0nf1zpjCEZ+xZGlTLquJ/3mT dPvKVDj9G+gC8JOZIwvqkSPpH9kXRCJHwlfjiQvKW9wDT4VzeyNknBVNf5087DXNtPef PnnKkEIvCUdqXu70QWDwgs/CWnS6eCeMn35akZUAv9yDzg1+9Q8FqFKHDi5tH8lzyi/I 22fQ== X-Gm-Message-State: ALoCoQlcvyHEeg4pGipwM5ZhBbLdi3gTSuCXVWdjksKzEGQ0OjD7bpC9nhzN4LrQQhSqE4pdrqLC X-Received: by 10.194.103.226 with SMTP id fz2mr2583603wjb.52.1378147584024; Mon, 02 Sep 2013 11:46:24 -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 i12sm19834405wiw.3.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Sep 2013 11:46:23 -0700 (PDT) From: Tom Gundersen To: linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Tom Gundersen , Dmitry Torokhov Subject: [PATCH] input: allow SERIO=m even without EXPERT=y Date: Mon, 2 Sep 2013 20:47:10 +0200 Message-Id: <1378147630-12471-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=ham 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