diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 17:45:51 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 17:45:51 -0500 |
| commit | e5570bbc9c06634cfac94e06ac1432b53d8595e5 (patch) | |
| tree | bfaf6b5ddedaa03d31400b25b25cfaa3bd0c9107 /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) | |
| parent | 6cc04a4420391c3f034afe8ea6e28d75912a70a3 (diff) | |
Merge branch 'for-3.3/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/soc
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 207a2ff9a8c4..529142aff766 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c | |||
| @@ -137,7 +137,7 @@ | |||
| 137 | #include <linux/mutex.h> | 137 | #include <linux/mutex.h> |
| 138 | #include <linux/spinlock.h> | 138 | #include <linux/spinlock.h> |
| 139 | 139 | ||
| 140 | #include <plat/common.h> | 140 | #include "common.h" |
| 141 | #include <plat/cpu.h> | 141 | #include <plat/cpu.h> |
| 142 | #include "clockdomain.h" | 142 | #include "clockdomain.h" |
| 143 | #include "powerdomain.h" | 143 | #include "powerdomain.h" |