From patchwork Sun Jun 9 20:02:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 2695011 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 1FDD0DF2A1 for ; Sun, 9 Jun 2013 20:03:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750976Ab3FIUDD (ORCPT ); Sun, 9 Jun 2013 16:03:03 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:56316 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750868Ab3FIUDB (ORCPT ); Sun, 9 Jun 2013 16:03:01 -0400 Received: from [192.168.4.101] (helo=deadeye.wl.decadent.org.uk) by shadbolt.decadent.org.uk with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1UllpK-0008T4-M1; Sun, 09 Jun 2013 21:02:58 +0100 Received: from ben by deadeye.wl.decadent.org.uk with local (Exim 4.80) (envelope-from ) id 1UllpJ-0006JB-Vw; Sun, 09 Jun 2013 21:02:57 +0100 Message-ID: <1370808172.5614.8.camel@deadeye.wl.decadent.org.uk> Subject: Input: Add missing dependencies on CONFIG_HAS_IOMEM From: Ben Hutchings To: Dmitry Torokhov Cc: Debian kernel maintainers , linux-input@vger.kernel.org, linux-s390@vger.kernel.org, stable@vger.kernel.org Date: Sun, 09 Jun 2013 21:02:52 +0100 X-Mailer: Evolution 3.4.4-3 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.4.101 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Several drivers don't build on s390 with CONFIG_PCI disabled as they require MMIO functions. Marking this for 3.9-stable only, as CONFIG_INPUT was previously disabled on s390. Signed-off-by: Ben Hutchings Cc: stable@vger.kernel.org # 3.9 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -431,6 +431,7 @@ config KEYBOARD_TEGRA config KEYBOARD_OPENCORES tristate "OpenCores Keyboard Controller" + depends on HAS_IOMEM help Say Y here if you want to use the OpenCores Keyboard Controller http://www.opencores.org/project,keyboardcontroller --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig @@ -205,6 +205,7 @@ config SERIO_XILINX_XPS_PS2 config SERIO_ALTERA_PS2 tristate "Altera UP PS/2 controller" + depends on HAS_IOMEM help Say Y here if you have Altera University Program PS/2 ports.