]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: 6280/1: imx: Fix build failure when including <mach/gpio.h> without <linux/spinl...
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Mon, 2 Aug 2010 07:32:22 +0000 (08:32 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 13 Aug 2010 20:19:40 +0000 (13:19 -0700)
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

index 6bd932c3e4e30c2e9b29d179bdb4bfb59bbefc85..7a0dc5aa2479c4d46794279ebf54d425e2f0fc30 100644 (file)
@@ -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>