From: Lee Jones <lee.jones@linaro.org>
Date: Tue, 2 Apr 2013 12:24:04 +0000 (+0100)
Subject: ARM: ux500: Use de-globalised version of id.h
X-Git-Tag: v3.10-rc1~186^2~25^2~38
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0fbc800726aaece4c549358e56ee774dcc089960;p=profile%2Fivi%2Fkernel-x86-ivi.git

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>
---

diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c
index 8161519..62b4aa4 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"),