aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-10-10 08:35:17 -0400
committerLinus Walleij <linus.walleij@linaro.org>2012-11-05 03:55:29 -0500
commitc3123cfdc9e3241055f1ba0d6ceb8b41f97e31b9 (patch)
tree9ba3caa2760a6415210d9e514b3aa61bc21a7a34 /arch/arm/mach-ux500
parent7cb15e10365203bffc5cc75c79725b6c31aa663e (diff)
pinctrl/nomadik: merge old pincfg header
This merges the old <plat/pincfg.h> header into <linux/platform_data/pinctrl-nomadik.h> and rids us of yet one more <plat/*> include. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r--arch/arm/mach-ux500/board-mop500-audio.c1
-rw-r--r--arch/arm/mach-ux500/board-mop500-pins.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c
index ea828cc56357..33631c9f1218 100644
--- a/arch/arm/mach-ux500/board-mop500-audio.c
+++ b/arch/arm/mach-ux500/board-mop500-audio.c
@@ -9,7 +9,6 @@
9#include <linux/gpio.h> 9#include <linux/gpio.h>
10#include <linux/platform_data/pinctrl-nomadik.h> 10#include <linux/platform_data/pinctrl-nomadik.h>
11 11
12#include <plat/pincfg.h>
13#include <plat/ste_dma40.h> 12#include <plat/ste_dma40.h>
14 13
15#include <mach/devices.h> 14#include <mach/devices.h>
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c
index 05f2bb581130..c34d4efd0d5c 100644
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -12,7 +12,6 @@
12#include <linux/platform_data/pinctrl-nomadik.h> 12#include <linux/platform_data/pinctrl-nomadik.h>
13 13
14#include <asm/mach-types.h> 14#include <asm/mach-types.h>
15#include <plat/pincfg.h>
16 15
17#include <mach/hardware.h> 16#include <mach/hardware.h>
18 17