]> git.baikalelectronics.ru Git - kernel.git/commit
ARM: 7991/1: sa1100: fix compile problem on Collie
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 25 Feb 2014 21:41:41 +0000 (22:41 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 7 Mar 2014 22:04:08 +0000 (22:04 +0000)
commit7532ce6d80802f6c1420ffb85bb54734aaae3da4
treee10390b3864936f8cb454ae3eda05b946c6965bc
parent4313a4d9c850cf10a8ac4275c2d8491c3df16aa7
ARM: 7991/1: sa1100: fix compile problem on Collie

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
6c419dc7 "ARM: 7841/1: sa1100: remove complex GPIO interface".

Fix this up by including the required header into
<mach/collie.h>.

Cc: stable@vger.kernel.org
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>
arch/arm/mach-sa1100/include/mach/collie.h