From 0fbc800726aaece4c549358e56ee774dcc089960 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Tue, 2 Apr 2013 13:24:04 +0100 Subject: [PATCH] ARM: ux500: Use de-globalised version of id.h Following commit: "7a4f260 ARM: ux500: de-globalize ", 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 Signed-off-by: Mark Brown --- arch/arm/mach-ux500/board-mop500-regulators.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 #include #include -#include /* 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"), -- 2.34.1