summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/devices-common.c
diff options
context:
space:
mode:
authorRobert Marklund <robert.marklund@stericsson.com>2011-05-17 21:07:33 +0200
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 15:15:19 +0200
commit5ed26ef8f3ae51ed656945bdf39051c9c1bdfa0b (patch)
tree57a55864c018f1c01e24e0b3c1a09c635d7caf61 /arch/arm/mach-ux500/devices-common.c
parent579abc0816054e0c1b1bca1a8f9cda6157cbbc34 (diff)
mach-ux500: gpio: Moved the NOMADIK_NR_GPIO
Move the NOMADIK_NR_GPIO to the right location. Fix warnings generated by this change. ST-Ericsson Linux next: ER 340134 ST-Ericsson ID: 340139 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I5b69d4a4662b707d815a867b2b5be19e4675d010 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24082 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/devices-common.c')
-rw-r--r--arch/arm/mach-ux500/devices-common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/devices-common.c b/arch/arm/mach-ux500/devices-common.c
index 0f0ce48774e..a6805094d6a 100644
--- a/arch/arm/mach-ux500/devices-common.c
+++ b/arch/arm/mach-ux500/devices-common.c
@@ -13,12 +13,12 @@
#include <linux/platform_device.h>
#include <linux/amba/bus.h>
#include <linux/pm.h>
+#include <linux/gpio.h>
#include <video/mcde_display.h>
#include <video/mcde_display-av8100.h>
#include <video/mcde_fb.h>
-#include <plat/gpio.h>
extern struct dev_power_domain ux500_dev_power_domain;
#include <mach/hardware.h>