Commit 11bcb328 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ed2d265d 8bc3bcc9

drivers/dma/imx-dma.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ 
 * http://www.gnu.org/copyleft/gpl.html

 * http://www.gnu.org/copyleft/gpl.html

 */

 */

#include <linux/init.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/types.h>

#include <linux/types.h>

#include <linux/mm.h>

#include <linux/mm.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

drivers/dma/imx-sdma.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <linux/dmaengine.h>

#include <linux/dmaengine.h>

#include <linux/of.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_device.h>

#include <linux/module.h>





#include <asm/irq.h>

#include <asm/irq.h>

#include <mach/sdma.h>

#include <mach/sdma.h>

drivers/mmc/host/sdhci-tegra.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/mmc/card.h>

#include <linux/mmc/card.h>

#include <linux/mmc/host.h>

#include <linux/mmc/host.h>

#include <linux/module.h>





#include <asm/gpio.h>

#include <asm/gpio.h>

drivers/power/max8998_charger.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

 */





#include <linux/module.h>

#include <linux/err.h>

#include <linux/err.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/slab.h>

drivers/staging/iio/gyro/adis16060_core.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/spi.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/sysfs.h>

#include <linux/sysfs.h>

#include <linux/module.h>





#include "../iio.h"

#include "../iio.h"

#include "../sysfs.h"

#include "../sysfs.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE