| From 868003ca7ad17ac6c1606dc36101f10a7825b399 Mon Sep 17 00:00:00 2001 |
| From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> |
| Date: Mon, 2 Aug 2010 08:32:22 +0100 |
| Subject: ARM: 6280/1: imx: Fix build failure when including <mach/gpio.h> without <linux/spinlock.h> |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> |
| |
| commit 868003ca7ad17ac6c1606dc36101f10a7825b399 upstream. |
| |
| This is a follow up to |
| |
| 14cb0de (arm/imx/gpio: add spinlock protection) |
| |
| and fixes the following build failure: |
| |
| CC arch/arm/mach-imx/pcm970-baseboard.o |
| In file included from arch/arm/include/asm/gpio.h:6, |
| from include/linux/gpio.h:8, |
| from arch/arm/mach-imx/pcm970-baseboard.c:20: |
| arch/arm/plat-mxc/include/mach/gpio.h:40: error: expected specifier-qualifier-list before 'spinlock_t' |
| |
| Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> |
| Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> |
| |
| --- |
| arch/arm/plat-mxc/include/mach/gpio.h | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/arch/arm/plat-mxc/include/mach/gpio.h |
| +++ b/arch/arm/plat-mxc/include/mach/gpio.h |
| @@ -19,6 +19,7 @@ |
| #ifndef __ASM_ARCH_MXC_GPIO_H__ |
| #define __ASM_ARCH_MXC_GPIO_H__ |
| |
| +#include <linux/spinlock.h> |
| #include <mach/hardware.h> |
| #include <asm-generic/gpio.h> |
| |
