git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

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