diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-01-26 01:31:21 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-01-26 01:31:21 +0100 |
| commit | 7b5c4a65cc27f017c170b025f8d6d75dabb11c6f (patch) | |
| tree | 05deacbc66a9f5c27147a6ea975211ae82281044 /arch/arm/mach-imx/mach-mx31lite.c | |
| parent | Merge branch 'x86/mm' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/tip/tip... (diff) | |
| parent | Linux 3.8-rc5 (diff) | |
| download | linux-7b5c4a65cc27f017c170b025f8d6d75dabb11c6f.tar.xz linux-7b5c4a65cc27f017c170b025f8d6d75dabb11c6f.zip | |
Merge tag 'v3.8-rc5' into x86/mm
The __pa() fixup series that follows touches KVM code that is not
present in the existing branch based on v3.7-rc5, so merge in the
current upstream from Linus.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31lite.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31lite.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/mach-mx31lite.c b/arch/arm/mach-imx/mach-mx31lite.c index ef57cff5abfb..bdcd92e59518 100644 --- a/arch/arm/mach-imx/mach-mx31lite.c +++ b/arch/arm/mach-imx/mach-mx31lite.c @@ -39,13 +39,12 @@ #include <asm/page.h> #include <asm/setup.h> -#include <mach/hardware.h> -#include <mach/common.h> -#include <mach/board-mx31lite.h> -#include <mach/iomux-mx3.h> -#include <mach/ulpi.h> - +#include "board-mx31lite.h" +#include "common.h" #include "devices-imx31.h" +#include "hardware.h" +#include "iomux-mx3.h" +#include "ulpi.h" /* * This file contains the module-specific initialization routines. |