diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-02-25 22:41:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-23 21:38:14 -0700 |
| commit | f5a82d2f4c8c46d753a739679d905191ca23c443 (patch) | |
| tree | b5b18c65d6e124bcc0f034e29d6f45170bcf5415 /drivers/regulator | |
| parent | 27fdae48c06e3d82abe9bce30447512a57a533f8 (diff) | |
| download | linux-3.10-f5a82d2f4c8c46d753a739679d905191ca23c443.tar.gz linux-3.10-f5a82d2f4c8c46d753a739679d905191ca23c443.tar.bz2 linux-3.10-f5a82d2f4c8c46d753a739679d905191ca23c443.zip | |
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 'drivers/regulator')
0 files changed, 0 insertions, 0 deletions