diff options
| author | Grant Likely <grant.likely@linaro.org> | 2013-08-28 15:18:13 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2013-08-28 15:18:13 -0400 |
| commit | 8be137f2664f0abb096626a9d2ce0fcdd955b109 (patch) | |
| tree | 2c53a5535265a58eb397d6fbbab2ec26e92e6931 /arch/arm/common/edma.c | |
| parent | 8851b9f1625ce0858e9b1bb0ae4a57d4b43178b1 (diff) | |
| parent | d8dfad3876e4386666b759da3c833d62fb8b2267 (diff) | |
Merge tag 'v3.11-rc7' into devicetree/next
Linux 3.11-rc7
Diffstat (limited to 'arch/arm/common/edma.c')
| -rw-r--r-- | arch/arm/common/edma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c index a432e6c1dac1..39ad030ac0c7 100644 --- a/arch/arm/common/edma.c +++ b/arch/arm/common/edma.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/io.h> | 26 | #include <linux/io.h> |
| 27 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
| 28 | #include <linux/edma.h> | 28 | #include <linux/edma.h> |
| 29 | #include <linux/err.h> | ||
| 30 | #include <linux/of_address.h> | 29 | #include <linux/of_address.h> |
| 31 | #include <linux/of_device.h> | 30 | #include <linux/of_device.h> |
| 32 | #include <linux/of_dma.h> | 31 | #include <linux/of_dma.h> |