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/common.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/common.c')
| -rw-r--r-- | arch/arm/mach-omap2/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 110e5b9db145..684b8a7cd401 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <linux/clk.h> | 17 | #include <linux/clk.h> |
| 18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
| 19 | 19 | ||
| 20 | #include <plat/common.h> | 20 | #include "common.h" |
| 21 | #include <plat/board.h> | 21 | #include <plat/board.h> |
| 22 | #include <plat/mux.h> | 22 | #include <plat/mux.h> |
| 23 | 23 | ||