diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /arch/arm/plat-omap/omap_device.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'arch/arm/plat-omap/omap_device.c')
| -rw-r--r-- | arch/arm/plat-omap/omap_device.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index 590435894848..0f5197479513 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c | |||
| @@ -79,6 +79,7 @@ | |||
| 79 | 79 | ||
| 80 | #include <linux/kernel.h> | 80 | #include <linux/kernel.h> |
| 81 | #include <linux/platform_device.h> | 81 | #include <linux/platform_device.h> |
| 82 | #include <linux/slab.h> | ||
| 82 | #include <linux/err.h> | 83 | #include <linux/err.h> |
| 83 | #include <linux/io.h> | 84 | #include <linux/io.h> |
| 84 | 85 | ||