diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-24 10:24:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-24 10:24:31 -0700 |
| commit | 11bcb32848ddb5ab28f09f142b625e2ba4d55c4c (patch) | |
| tree | 9a2c085e1fce41012bb0f2a340f6ceaaf616b7a0 /drivers/dma | |
| parent | ed2d265d1266736bd294332d7f649003943ae36e (diff) | |
| parent | 8bc3bcc93a2b4e47d5d410146f6546bca6171663 (diff) | |
| download | linux-3.10-11bcb32848ddb5ab28f09f142b625e2ba4d55c4c.tar.gz linux-3.10-11bcb32848ddb5ab28f09f142b625e2ba4d55c4c.tar.bz2 linux-3.10-11bcb32848ddb5ab28f09f142b625e2ba4d55c4c.zip | |
Merge tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Pull cleanup of fs/ and lib/ users of module.h from Paul Gortmaker:
"Fix up files in fs/ and lib/ dirs to only use module.h if they really
need it.
These are trivial in scope vs the work done previously. We now have
things where any few remaining cleanups can be farmed out to arch or
subsystem maintainers, and I have done so when possible. What is
remaining here represents the bits that don't clearly lie within a
single arch/subsystem boundary, like the fs dir and the lib dir.
Some duplicate includes arising from overlapping fixes from
independent subsystem maintainer submissions are also quashed."
Fix up trivial conflicts due to clashes with other include file cleanups
(including some due to the previous bug.h cleanup pull).
* tag 'module-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
lib: reduce the use of module.h wherever possible
fs: reduce the use of module.h wherever possible
includecheck: delete any duplicate instances of module.h
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/imx-dma.c | 1 | ||||
| -rw-r--r-- | drivers/dma/imx-sdma.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index e4383ee2c9a..38586ba8da9 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c @@ -14,7 +14,6 @@ * http://www.gnu.org/copyleft/gpl.html */ #include <linux/init.h> -#include <linux/module.h> #include <linux/types.h> #include <linux/mm.h> #include <linux/interrupt.h> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 8bc5acf36ee..63540d3e215 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -35,7 +35,6 @@ #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> |