diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-01-29 15:44:45 -0500 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-02-28 19:31:56 -0500 |
commit | 13ae246db4a02971ef4f557af1f6d3e21d64b710 (patch) | |
tree | e40e4a686a57f987b1a3c682656de174e6b980b0 | |
parent | 6b21d18ed50c7d145220b0724ea7f2613abf0f95 (diff) |
includecheck: delete any duplicate instances of module.h
Different tree maintainers picked up independently generated
trivial compile fixes based on linux-next testing, resulting
in some cases where a file would have got more than one addition
of module.h once everything was all merged together.
Delete any duplicates so includecheck isn't complaining about
anything related to module.h/export.h changes.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r-- | arch/blackfin/mach-bf537/boards/pnav10.c | 1 | ||||
-rw-r--r-- | drivers/dma/imx-dma.c | 1 | ||||
-rw-r--r-- | drivers/dma/imx-sdma.c | 1 | ||||
-rw-r--r-- | drivers/media/video/adp1653.c | 1 | ||||
-rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 1 | ||||
-rw-r--r-- | drivers/power/max8998_charger.c | 1 | ||||
-rw-r--r-- | drivers/staging/iio/dac/ad5686.c | 1 | ||||
-rw-r--r-- | drivers/staging/iio/gyro/adis16060_core.c | 1 | ||||
-rw-r--r-- | drivers/staging/sm7xx/smtcfb.c | 1 | ||||
-rw-r--r-- | drivers/usb/dwc3/core.c | 1 | ||||
-rw-r--r-- | drivers/usb/dwc3/dwc3-omap.c | 1 | ||||
-rw-r--r-- | kernel/params.c | 1 |
12 files changed, 0 insertions, 12 deletions
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c index 6fd84709fc68..7d15a3024e48 100644 --- a/arch/blackfin/mach-bf537/boards/pnav10.c +++ b/arch/blackfin/mach-bf537/boards/pnav10.c | |||
@@ -101,7 +101,6 @@ static struct platform_device smc91x_device = { | |||
101 | 101 | ||
102 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 102 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
103 | #include <linux/bfin_mac.h> | 103 | #include <linux/bfin_mac.h> |
104 | #include <linux/export.h> | ||
105 | static const unsigned short bfin_mac_peripherals[] = P_RMII0; | 104 | static const unsigned short bfin_mac_peripherals[] = P_RMII0; |
106 | 105 | ||
107 | static struct bfin_phydev_platform_data bfin_phydev_data[] = { | 106 | static struct bfin_phydev_platform_data bfin_phydev_data[] = { |
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index e4383ee2c9ac..38586ba8da91 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c | |||
@@ -14,7 +14,6 @@ | |||
14 | * http://www.gnu.org/copyleft/gpl.html | 14 | * http://www.gnu.org/copyleft/gpl.html |
15 | */ | 15 | */ |
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/module.h> | ||
18 | #include <linux/types.h> | 17 | #include <linux/types.h> |
19 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
20 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 8bc5acf36ee5..63540d3e2153 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <linux/dmaengine.h> | 35 | #include <linux/dmaengine.h> |
36 | #include <linux/of.h> | 36 | #include <linux/of.h> |
37 | #include <linux/of_device.h> | 37 | #include <linux/of_device.h> |
38 | #include <linux/module.h> | ||
39 | 38 | ||
40 | #include <asm/irq.h> | 39 | #include <asm/irq.h> |
41 | #include <mach/sdma.h> | 40 | #include <mach/sdma.h> |
diff --git a/drivers/media/video/adp1653.c b/drivers/media/video/adp1653.c index 12eedf4d515a..6e7d094fa2b6 100644 --- a/drivers/media/video/adp1653.c +++ b/drivers/media/video/adp1653.c | |||
@@ -33,7 +33,6 @@ | |||
33 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
35 | #include <linux/i2c.h> | 35 | #include <linux/i2c.h> |
36 | #include <linux/module.h> | ||
37 | #include <linux/slab.h> | 36 | #include <linux/slab.h> |
38 | #include <linux/version.h> | 37 | #include <linux/version.h> |
39 | #include <media/adp1653.h> | 38 | #include <media/adp1653.h> |
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index 78a36eba4df0..cb348569454b 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <linux/gpio.h> | 23 | #include <linux/gpio.h> |
24 | #include <linux/mmc/card.h> | 24 | #include <linux/mmc/card.h> |
25 | #include <linux/mmc/host.h> | 25 | #include <linux/mmc/host.h> |
26 | #include <linux/module.h> | ||
27 | 26 | ||
28 | #include <asm/gpio.h> | 27 | #include <asm/gpio.h> |
29 | 28 | ||
diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c index 9b3f2bf56e70..6dc01c255592 100644 --- a/drivers/power/max8998_charger.c +++ b/drivers/power/max8998_charger.c | |||
@@ -19,7 +19,6 @@ | |||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <linux/module.h> | ||
23 | #include <linux/err.h> | 22 | #include <linux/err.h> |
24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
25 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
diff --git a/drivers/staging/iio/dac/ad5686.c b/drivers/staging/iio/dac/ad5686.c index ce2d6193dd89..2415a6e60c77 100644 --- a/drivers/staging/iio/dac/ad5686.c +++ b/drivers/staging/iio/dac/ad5686.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
16 | #include <linux/sysfs.h> | 16 | #include <linux/sysfs.h> |
17 | #include <linux/regulator/consumer.h> | 17 | #include <linux/regulator/consumer.h> |
18 | #include <linux/module.h> | ||
19 | 18 | ||
20 | #include "../iio.h" | 19 | #include "../iio.h" |
21 | #include "../sysfs.h" | 20 | #include "../sysfs.h" |
diff --git a/drivers/staging/iio/gyro/adis16060_core.c b/drivers/staging/iio/gyro/adis16060_core.c index c0ca7093e0ed..02cc23420b90 100644 --- a/drivers/staging/iio/gyro/adis16060_core.c +++ b/drivers/staging/iio/gyro/adis16060_core.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <linux/spi/spi.h> | 14 | #include <linux/spi/spi.h> |
15 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
16 | #include <linux/sysfs.h> | 16 | #include <linux/sysfs.h> |
17 | #include <linux/module.h> | ||
18 | 17 | ||
19 | #include "../iio.h" | 18 | #include "../iio.h" |
20 | #include "../sysfs.h" | 19 | #include "../sysfs.h" |
diff --git a/drivers/staging/sm7xx/smtcfb.c b/drivers/staging/sm7xx/smtcfb.c index ae0035f327e7..1b3e2d0c6993 100644 --- a/drivers/staging/sm7xx/smtcfb.c +++ b/drivers/staging/sm7xx/smtcfb.c | |||
@@ -41,7 +41,6 @@ | |||
41 | 41 | ||
42 | #ifdef CONFIG_PM | 42 | #ifdef CONFIG_PM |
43 | #include <linux/pm.h> | 43 | #include <linux/pm.h> |
44 | #include <linux/module.h> | ||
45 | #endif | 44 | #endif |
46 | 45 | ||
47 | #include "smtcfb.h" | 46 | #include "smtcfb.h" |
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 7c9df630dbe4..eed4a5b6d394 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c | |||
@@ -51,7 +51,6 @@ | |||
51 | 51 | ||
52 | #include <linux/usb/ch9.h> | 52 | #include <linux/usb/ch9.h> |
53 | #include <linux/usb/gadget.h> | 53 | #include <linux/usb/gadget.h> |
54 | #include <linux/module.h> | ||
55 | 54 | ||
56 | #include "core.h" | 55 | #include "core.h" |
57 | #include "gadget.h" | 56 | #include "gadget.h" |
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c index 3274ac8f1200..92cc7b8bc091 100644 --- a/drivers/usb/dwc3/dwc3-omap.c +++ b/drivers/usb/dwc3/dwc3-omap.c | |||
@@ -46,7 +46,6 @@ | |||
46 | #include <linux/dma-mapping.h> | 46 | #include <linux/dma-mapping.h> |
47 | #include <linux/ioport.h> | 47 | #include <linux/ioport.h> |
48 | #include <linux/io.h> | 48 | #include <linux/io.h> |
49 | #include <linux/module.h> | ||
50 | 49 | ||
51 | #include "core.h" | 50 | #include "core.h" |
52 | #include "io.h" | 51 | #include "io.h" |
diff --git a/kernel/params.c b/kernel/params.c index 4bc965d8a1fe..47f5bf12434a 100644 --- a/kernel/params.c +++ b/kernel/params.c | |||
@@ -15,7 +15,6 @@ | |||
15 | along with this program; if not, write to the Free Software | 15 | along with this program; if not, write to the Free Software |
16 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
17 | */ | 17 | */ |
18 | #include <linux/module.h> | ||
19 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
20 | #include <linux/string.h> | 19 | #include <linux/string.h> |
21 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |