path: root/arch
diff options
authorLinus Walleij <linus.walleij@linaro.org>2014-02-25 22:41:41 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-23 21:38:14 -0700
commitf5a82d2f4c8c46d753a739679d905191ca23c443 (patch)
treeb5b18c65d6e124bcc0f034e29d6f45170bcf5415 /arch
parent27fdae48c06e3d82abe9bce30447512a57a533f8 (diff)
ARM: 7991/1: sa1100: fix compile problem on Collie
commit 052450fdc55894a39fbae93d9bbe43947956f663 upstream. Due to a problem in the MFD Kconfig it was not possible to compile the UCB battery driver for the Collie SA1100 system, in turn making it impossible to compile in the battery driver. (See patch "mfd: include all drivers in subsystem menu".) After fixing the MFD Kconfig (separate patch) a compile error appears in the Collie battery driver due to the <mach/collie.h> implicitly requiring <mach/hardware.h> through <linux/gpio.h> via <mach/gpio.h> prior to commit 40ca061b "ARM: 7841/1: sa1100: remove complex GPIO interface". Fix this up by including the required header into <mach/collie.h>. Cc: Andrea Adami <andrea.adami@gmail.com> Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/collie.h b/arch/arm/mach-sa1100/include/mach/collie.h
index f33679d2d3e..50e1d850ee2 100644
--- a/arch/arm/mach-sa1100/include/mach/collie.h
+++ b/arch/arm/mach-sa1100/include/mach/collie.h
@@ -13,6 +13,8 @@
+#include "hardware.h" /* Gives GPIO_MAX */
extern void locomolcd_power(int on);