diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-09 14:55:25 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-09 14:55:25 +0530 |
| commit | 5170c051a56244816d948c43592c1b2805ed4f3a (patch) | |
| tree | 9283dcb2d706947835941599ddf3be7b2901b499 /drivers | |
| parent | 3ecf51a45c0e218d70df2cc905b668fa0c115f73 (diff) | |
| download | talos-obmc-linux-5170c051a56244816d948c43592c1b2805ed4f3a.tar.gz talos-obmc-linux-5170c051a56244816d948c43592c1b2805ed4f3a.zip | |
Revert "drivers/dma: linux/module.h included twice"
This reverts commit 865d9438eb1f7670d2e88849f059db551b320887.
The module.h incsuion twice has been updated tree wide hence this is not
required to be merged.
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/imx-dma.c | 1 | ||||
| -rw-r--r-- | drivers/dma/imx-sdma.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index 85b3d3c21d91..c32103f04fb3 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c @@ -26,6 +26,7 @@ #include <linux/slab.h> #include <linux/platform_device.h> #include <linux/dmaengine.h> +#include <linux/module.h> #include <asm/irq.h> #include <mach/dma-v1.h> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index c4958823518a..f0bfc0e07416 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -36,6 +36,7 @@ #include <linux/dmaengine.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/module.h> #include <asm/irq.h> #include <mach/sdma.h> |
