diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-10 21:10:34 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-10 21:10:34 -0500 |
| commit | 774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch) | |
| tree | a9068b769fa5956beaabc2445ebe1d575585d7d3 /arch/arm/mach-omap2/omap3-iommu.c | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
| parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) | |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'arch/arm/mach-omap2/omap3-iommu.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap3-iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap3-iommu.c b/arch/arm/mach-omap2/omap3-iommu.c index 194189c746c2..6a9bf4f59d8a 100644 --- a/arch/arm/mach-omap2/omap3-iommu.c +++ b/arch/arm/mach-omap2/omap3-iommu.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | 14 | ||
| 15 | #include <mach/iommu.h> | 15 | #include <plat/iommu.h> |
| 16 | 16 | ||
| 17 | #define OMAP3_MMU1_BASE 0x480bd400 | 17 | #define OMAP3_MMU1_BASE 0x480bd400 |
| 18 | #define OMAP3_MMU2_BASE 0x5d000000 | 18 | #define OMAP3_MMU2_BASE 0x5d000000 |