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/hdq1w.h | |
| 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/hdq1w.h')
| -rw-r--r-- | arch/arm/mach-omap2/hdq1w.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/hdq1w.h b/arch/arm/mach-omap2/hdq1w.h index 0c1efc846d8d..c7e08d2a7a46 100644 --- a/arch/arm/mach-omap2/hdq1w.h +++ b/arch/arm/mach-omap2/hdq1w.h | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #ifndef ARCH_ARM_MACH_OMAP2_HDQ1W_H | 21 | #ifndef ARCH_ARM_MACH_OMAP2_HDQ1W_H |
| 22 | #define ARCH_ARM_MACH_OMAP2_HDQ1W_H | 22 | #define ARCH_ARM_MACH_OMAP2_HDQ1W_H |
| 23 | 23 | ||
| 24 | #include <plat/omap_hwmod.h> | 24 | #include "omap_hwmod.h" |
| 25 | 25 | ||
| 26 | /* | 26 | /* |
| 27 | * XXX A future cleanup patch should modify | 27 | * XXX A future cleanup patch should modify |