diff options
| author | Lee Jones <lee.jones@linaro.org> | 2013-04-02 13:24:04 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-02 23:01:41 +0100 |
| commit | 0fbc800726aaece4c549358e56ee774dcc089960 (patch) | |
| tree | 1ac405ea86e065eccc3e6bbadc0d3a5afe8a8188 /arch/arm | |
| parent | 62ab4111113cf0d54c2b264730533fb53a04cc30 (diff) | |
| download | linux-0fbc800726aaece4c549358e56ee774dcc089960.tar.gz linux-0fbc800726aaece4c549358e56ee774dcc089960.tar.bz2 linux-0fbc800726aaece4c549358e56ee774dcc089960.zip | |
ARM: ux500: Use de-globalised version of id.h
Following commit: "7a4f260 ARM: ux500: de-globalize <mach/id.h>",
the use of 'mach/id.h' is no longer valid. This patch continues
the work of the aforementioned commit on patches applied around
the same time, containing the merge-conflict.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-regulators.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 816151903d46..62b4aa4cbfb3 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -12,8 +12,8 @@ #include <linux/kernel.h> #include <linux/regulator/machine.h> #include <linux/regulator/ab8500.h> -#include <mach/id.h> /* to identify older boards for fixes */ #include "board-mop500-regulators.h" +#include "id.h" static struct regulator_consumer_supply gpio_en_3v3_consumers[] = { REGULATOR_SUPPLY("vdd33a", "smsc911x.0"), |