Commit 0fbc8007 authored Apr 02, 2013 by Lee Jones Committed by Mark Brown Apr 02, 2013

ARM: ux500: Use de-globalised version of id.h



Following commit: "7a4f2609 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>

parent 62ab4111

arch/arm/mach-ux500/board-mop500-regulators.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"),