diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-16 01:02:34 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-16 01:02:34 -0500 |
| commit | 02735a29d8ce882ec698803f064e17888874780c (patch) | |
| tree | 6a4afa3bc8b6d4334df24910a56f77adf126b0c7 /arch/arm/mach-msm | |
| parent | 8d685b7f4d9c9882442bf1b492558d5f17b694fa (diff) | |
| parent | 3d911ad22e8405c1a333a6812e405cb1a5ae9829 (diff) | |
Merge branch 'at91/defconfig' into next/cleanup
Diffstat (limited to 'arch/arm/mach-msm')
| -rw-r--r-- | arch/arm/mach-msm/devices-iommu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/devices-iommu.c b/arch/arm/mach-msm/devices-iommu.c index 24030d0da6e3..0fb7a17df398 100644 --- a/arch/arm/mach-msm/devices-iommu.c +++ b/arch/arm/mach-msm/devices-iommu.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
| 20 | #include <linux/bootmem.h> | 20 | #include <linux/bootmem.h> |
| 21 | #include <linux/module.h> | ||
| 21 | #include <mach/irqs.h> | 22 | #include <mach/irqs.h> |
| 22 | #include <mach/iommu.h> | 23 | #include <mach/iommu.h> |
| 23 | 24 | ||