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/timer.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/timer.c')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 037b0d7d4e05..9edcd520510f 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | #include <plat/dmtimer.h> | 41 | #include <plat/dmtimer.h> |
| 42 | #include <asm/localtimer.h> | 42 | #include <asm/localtimer.h> |
| 43 | #include <asm/sched_clock.h> | 43 | #include <asm/sched_clock.h> |
| 44 | #include <plat/common.h> | 44 | #include "common.h" |
| 45 | #include <plat/omap_hwmod.h> | 45 | #include <plat/omap_hwmod.h> |
| 46 | #include <plat/omap_device.h> | 46 | #include <plat/omap_device.h> |
| 47 | #include <plat/omap-pm.h> | 47 | #include <plat/omap-pm.h> |