diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-17 05:12:26 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-17 05:13:04 +0200 |
| commit | f4936639bc4a75218b5598ff69c52b9a8dd7f23d (patch) | |
| tree | 9c08fc81cb3d3e658ca7f8dc20a949496d9e6130 /arch/arm/mach-omap2/id.c | |
| parent | Merge tag 'devel-omap-device-for-v3.7' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | Merge tag 'omap-devel-a2-for-3.7' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-f4936639bc4a75218b5598ff69c52b9a8dd7f23d.tar.xz linux-f4936639bc4a75218b5598ff69c52b9a8dd7f23d.zip | |
Merge tag 'omap-devel-am33xx-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
From Tony Lindgren:
From Paul Walmsley <paul@pwsan.com>:
AM33xx hwmod data and miscellaneous clock and hwmod fixes. AM33xx
should now boot on mainline after this is applied, according to
Vaibhav.
(The shortlog makes no sense here since it contains mostly the dependent
cleanups that are part of the preceding branches).
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2/id.c')
| -rw-r--r-- | arch/arm/mach-omap2/id.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 40373db649aa..7219df0e831a 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -22,10 +22,10 @@ #include <asm/cputype.h> #include "common.h" -#include <plat/cpu.h> #include <mach/id.h> +#include "soc.h" #include "control.h" static unsigned int omap_revision; |