summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/cpu-db8500.c
diff options
context:
space:
mode:
authorLinus Walleij2012-10-10 14:27:58 +0200
committerLinus Walleij2012-11-05 09:55:27 +0100
commit7cb15e10365203bffc5cc75c79725b6c31aa663e (patch)
treee548e9968c70cb189cbb3ac4f292d41f46f467bc /arch/arm/mach-ux500/cpu-db8500.c
parentARM: plat-nomadik: move NMK_GPIO_PER_CHIP into gpio-nomadik.h (diff)
downloadkernel-qcow2-linux-7cb15e10365203bffc5cc75c79725b6c31aa663e.tar.gz
kernel-qcow2-linux-7cb15e10365203bffc5cc75c79725b6c31aa663e.tar.xz
kernel-qcow2-linux-7cb15e10365203bffc5cc75c79725b6c31aa663e.zip
pinctrl/nomadik: move the platform data header
This moves the platform data header for the Nomadik pin controller to <linux/platform_data/pinctrl-nomadik.h>. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/cpu-db8500.c')
-rw-r--r--arch/arm/mach-ux500/cpu-db8500.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index bcdfe6b1d453..87a8f9fbb100 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -17,14 +17,14 @@
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/mfd/abx500/ab8500.h>
+#include <linux/platform_data/usb-musb-ux500.h>
+#include <linux/platform_data/pinctrl-nomadik.h>
#include <asm/pmu.h>
#include <asm/mach/map.h>
-#include <plat/gpio-nomadik.h>
#include <mach/hardware.h>
#include <mach/setup.h>
#include <mach/devices.h>
-#include <linux/platform_data/usb-musb-ux500.h>
#include <mach/db8500-regs.h>
#include "devices-db8500.h"