diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-16 00:18:53 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-16 00:18:53 -0500 |
| commit | b46ad442a998beb8453fd6b9c5a67cd8a1cd1889 (patch) | |
| tree | a5da6ea4aa5c6575fbeaddd3e24fbf9d20087019 /arch/arm/mach-omap2/timer.c | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
| parent | a890b6760d975cdbdfcdf5753dab4c91059af9b1 (diff) | |
Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/board
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> |