From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Date: Sat, 14 Jan 2012 23:33:25 +0000 Subject: [PATCH] ARM: Fix regression caused by ARCH_NR_GPIOS removal Message-Id: <201201150033.25885.rjw@sisk.pl> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-arm-kernel@lists.infradead.org From: Rafael J. Wysocki Commit 3dea19e826da3dd43b3dc308aca299c0b7263c6b (ARM: 7244/1: mach-shmobile: Use CONFIG_ARCH_NR_GPIO) removed ARCH_NR_GPIOS and introduced ARCH_NR_GPIO instead without changing the users of that symbol. As a result, the kernels including that commit don't boot on my test-bed Mackerel board. Fix the problem by defining ARCH_NR_GPIOS again. Signed-off-by: Rafael J. Wysocki --- arch/arm/include/asm/gpio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux/arch/arm/include/asm/gpio.h =================================--- linux.orig/arch/arm/include/asm/gpio.h +++ linux/arch/arm/include/asm/gpio.h @@ -2,7 +2,7 @@ #define _ARCH_ARM_GPIO_H #if CONFIG_ARCH_NR_GPIO > 0 -#define ARCH_NR_GPIO CONFIG_ARCH_NR_GPIO +#define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO #endif /* not all ARM platforms necessarily support this API ... */ From mboxrd@z Thu Jan 1 00:00:00 1970 From: rjw@sisk.pl (Rafael J. Wysocki) Date: Sun, 15 Jan 2012 00:33:25 +0100 Subject: [PATCH] ARM: Fix regression caused by ARCH_NR_GPIOS removal Message-ID: <201201150033.25885.rjw@sisk.pl> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Rafael J. Wysocki Commit 3dea19e826da3dd43b3dc308aca299c0b7263c6b (ARM: 7244/1: mach-shmobile: Use CONFIG_ARCH_NR_GPIO) removed ARCH_NR_GPIOS and introduced ARCH_NR_GPIO instead without changing the users of that symbol. As a result, the kernels including that commit don't boot on my test-bed Mackerel board. Fix the problem by defining ARCH_NR_GPIOS again. Signed-off-by: Rafael J. Wysocki --- arch/arm/include/asm/gpio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux/arch/arm/include/asm/gpio.h =================================================================== --- linux.orig/arch/arm/include/asm/gpio.h +++ linux/arch/arm/include/asm/gpio.h @@ -2,7 +2,7 @@ #define _ARCH_ARM_GPIO_H #if CONFIG_ARCH_NR_GPIO > 0 -#define ARCH_NR_GPIO CONFIG_ARCH_NR_GPIO +#define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO #endif /* not all ARM platforms necessarily support this API ... */ From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752268Ab2ANX37 (ORCPT ); Sat, 14 Jan 2012 18:29:59 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:34346 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751032Ab2ANX36 (ORCPT ); Sat, 14 Jan 2012 18:29:58 -0500 From: "Rafael J. Wysocki" To: linux-arm-kernel@lists.infradead.org, Russell King Subject: [PATCH] ARM: Fix regression caused by ARCH_NR_GPIOS removal Date: Sun, 15 Jan 2012 00:33:25 +0100 User-Agent: KMail/1.13.6 (Linux/3.2.0+; KDE/4.6.0; x86_64; ; ) Cc: Paul Mundt , linux-sh@vger.kernel.org, LKML , Magnus Damm , Peter De Schrijver (NVIDIA) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201201150033.25885.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafael J. Wysocki Commit 3dea19e826da3dd43b3dc308aca299c0b7263c6b (ARM: 7244/1: mach-shmobile: Use CONFIG_ARCH_NR_GPIO) removed ARCH_NR_GPIOS and introduced ARCH_NR_GPIO instead without changing the users of that symbol. As a result, the kernels including that commit don't boot on my test-bed Mackerel board. Fix the problem by defining ARCH_NR_GPIOS again. Signed-off-by: Rafael J. Wysocki --- arch/arm/include/asm/gpio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux/arch/arm/include/asm/gpio.h =================================================================== --- linux.orig/arch/arm/include/asm/gpio.h +++ linux/arch/arm/include/asm/gpio.h @@ -2,7 +2,7 @@ #define _ARCH_ARM_GPIO_H #if CONFIG_ARCH_NR_GPIO > 0 -#define ARCH_NR_GPIO CONFIG_ARCH_NR_GPIO +#define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO #endif /* not all ARM platforms necessarily support this API ... */