diff options
author | Tony Lindgren <tony@atomide.com> | 2009-11-11 03:10:34 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-11-11 03:10:34 +0100 |
commit | 774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch) | |
tree | a9068b769fa5956beaabc2445ebe1d575585d7d3 /arch/arm/plat-omap/iovmm.c | |
parent | Linux 2.6.32-rc6 (diff) | |
parent | omap: headers: Move remaining headers from include/mach to include/plat (diff) | |
download | linux-774facda20d2f8f0f61fa312d8028dad18ac5ee4.tar.xz linux-774facda20d2f8f0f61fa312d8028dad18ac5ee4.zip |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'arch/arm/plat-omap/iovmm.c')
-rw-r--r-- | arch/arm/plat-omap/iovmm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/iovmm.c b/arch/arm/plat-omap/iovmm.c index dc3fac3dd0ea..0ce36bbef9d2 100644 --- a/arch/arm/plat-omap/iovmm.c +++ b/arch/arm/plat-omap/iovmm.c @@ -18,8 +18,8 @@ #include <asm/cacheflush.h> #include <asm/mach/map.h> -#include <mach/iommu.h> -#include <mach/iovmm.h> +#include <plat/iommu.h> +#include <plat/iovmm.h> #include "iopgtable.h" |