diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 11:18:30 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 11:18:30 -0500 |
| commit | cf1fb2dfa7601770037d24a328f259e2cfd97fb0 (patch) | |
| tree | 1a38c170cc73ca9fa02b69a3194f487b0c1ef55c /arch/arm/mach-omap2/gpio.c | |
| parent | c9b1c7b34a17742054e2b967f7c126964343e4f2 (diff) | |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
Merge branch 'omap/headers4' into next/drivers
This avoids merge conflicts between the omap header changes and the gpmc
updates.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/gpio.c')
| -rw-r--r-- | arch/arm/mach-omap2/gpio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c index d1058f16fb40..399acabc3d0b 100644 --- a/arch/arm/mach-omap2/gpio.c +++ b/arch/arm/mach-omap2/gpio.c | |||
| @@ -23,9 +23,9 @@ | |||
| 23 | #include <linux/of.h> | 23 | #include <linux/of.h> |
| 24 | #include <linux/platform_data/gpio-omap.h> | 24 | #include <linux/platform_data/gpio-omap.h> |
| 25 | 25 | ||
| 26 | #include <plat/omap_hwmod.h> | 26 | #include "omap_hwmod.h" |
| 27 | #include <plat/omap_device.h> | 27 | #include "omap_device.h" |
| 28 | #include <plat/omap-pm.h> | 28 | #include "omap-pm.h" |
| 29 | 29 | ||
| 30 | #include "powerdomain.h" | 30 | #include "powerdomain.h" |
| 31 | 31 | ||