diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
| commit | a76df42a675c9936e8bf3607226e74c8a5e2d847 (patch) | |
| tree | 96d93706d884dea956393653452fa4d78d8d7f76 /arch/arm/plat-omap/iommu-debug.c | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
| parent | 8171d88089ad63fc442b2bf32af7c18653adc5cb (diff) | |
Merge 7xx-iosplit-plat-merge with omap-fixes
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
Diffstat (limited to 'arch/arm/plat-omap/iommu-debug.c')
| -rw-r--r-- | arch/arm/plat-omap/iommu-debug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/iommu-debug.c b/arch/arm/plat-omap/iommu-debug.c index c799b3b0d709..afd1c27cff7c 100644 --- a/arch/arm/plat-omap/iommu-debug.c +++ b/arch/arm/plat-omap/iommu-debug.c | |||
| @@ -17,8 +17,8 @@ | |||
| 17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 18 | #include <linux/debugfs.h> | 18 | #include <linux/debugfs.h> |
| 19 | 19 | ||
| 20 | #include <mach/iommu.h> | 20 | #include <plat/iommu.h> |
| 21 | #include <mach/iovmm.h> | 21 | #include <plat/iovmm.h> |
| 22 | 22 | ||
| 23 | #include "iopgtable.h" | 23 | #include "iopgtable.h" |
| 24 | 24 | ||