diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-04-04 10:23:20 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-05-19 07:11:08 -0400 |
commit | f4bf03d8b7fbd3e2d38d895a89c53df039976fd0 (patch) | |
tree | c0a4981c836c61dbd76636b1706323c6bb73abcb /arch/arm/mach-imx | |
parent | 5309498a56842d0acb723196b7bc57bfb9aee918 (diff) |
ARM: imx: remove #includes already available from devices-common.h
Most machine files include "devices-imxXX.h" which in turn includes
<mach/devices-common.h>. The latter already includes many headers
that the machine files don't need to include again.
These were found by:
$ grep \#include arch/arm/plat-mxc/include/mach/devices-common.h > tmpfile
$ git grep -l 'devices-imx' arch/arm | xargs grep -f tmpfile -F
(but I kept linux/init.h, linux/kernel.h and linux/platform_device.h)
LAKML-Reference: 1298912674-15153-2-git-send-email-u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r-- | arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-cpuimx27.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx1ads.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx21ads.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx25_3ds.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx27ads.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mxt_td60.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-pca100.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-pcm038.c | 1 |
11 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c index fa5288018ba7..5911281da5f5 100644 --- a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <mach/common.h> | 32 | #include <mach/common.h> |
33 | #include <mach/iomux-mx27.h> | 33 | #include <mach/iomux-mx27.h> |
34 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
35 | #include <mach/spi.h> | ||
36 | #include <mach/audmux.h> | 35 | #include <mach/audmux.h> |
37 | 36 | ||
38 | #include "devices-imx27.h" | 37 | #include "devices-imx27.h" |
diff --git a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c index 176e61bf44b6..f9ef04acdab1 100644 --- a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | |||
@@ -31,9 +31,7 @@ | |||
31 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
32 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
33 | #include <mach/mx25.h> | 33 | #include <mach/mx25.h> |
34 | #include <mach/imx-uart.h> | ||
35 | #include <mach/audmux.h> | 34 | #include <mach/audmux.h> |
36 | #include <mach/esdhc.h> | ||
37 | 35 | ||
38 | #include "devices-imx25.h" | 36 | #include "devices-imx25.h" |
39 | 37 | ||
diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c index 759299bb035b..46a2e41d43d2 100644 --- a/arch/arm/mach-imx/mach-cpuimx27.c +++ b/arch/arm/mach-imx/mach-cpuimx27.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <mach/common.h> | 38 | #include <mach/common.h> |
39 | #include <mach/hardware.h> | 39 | #include <mach/hardware.h> |
40 | #include <mach/iomux-mx27.h> | 40 | #include <mach/iomux-mx27.h> |
41 | #include <mach/mxc_nand.h> | ||
42 | #include <mach/ulpi.h> | 41 | #include <mach/ulpi.h> |
43 | 42 | ||
44 | #include "devices-imx27.h" | 43 | #include "devices-imx27.h" |
diff --git a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c index 9da8d18eeb00..148cff2819b9 100644 --- a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c +++ b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c | |||
@@ -36,8 +36,6 @@ | |||
36 | #include <asm/mach/map.h> | 36 | #include <asm/mach/map.h> |
37 | #include <mach/common.h> | 37 | #include <mach/common.h> |
38 | #include <mach/mx25.h> | 38 | #include <mach/mx25.h> |
39 | #include <mach/mxc_nand.h> | ||
40 | #include <mach/imxfb.h> | ||
41 | #include <mach/iomux-mx25.h> | 39 | #include <mach/iomux-mx25.h> |
42 | 40 | ||
43 | #include "devices-imx25.h" | 41 | #include "devices-imx25.h" |
diff --git a/arch/arm/mach-imx/mach-mx1ads.c b/arch/arm/mach-imx/mach-mx1ads.c index 47cf56ac6d5b..38ec5cbbda9b 100644 --- a/arch/arm/mach-imx/mach-mx1ads.c +++ b/arch/arm/mach-imx/mach-mx1ads.c | |||
@@ -25,7 +25,6 @@ | |||
25 | 25 | ||
26 | #include <mach/common.h> | 26 | #include <mach/common.h> |
27 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
28 | #include <mach/i2c.h> | ||
29 | #include <mach/iomux-mx1.h> | 28 | #include <mach/iomux-mx1.h> |
30 | #include <mach/irqs.h> | 29 | #include <mach/irqs.h> |
31 | 30 | ||
diff --git a/arch/arm/mach-imx/mach-mx21ads.c b/arch/arm/mach-imx/mach-mx21ads.c index fa52a1086eae..74ac88978ddd 100644 --- a/arch/arm/mach-imx/mach-mx21ads.c +++ b/arch/arm/mach-imx/mach-mx21ads.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <asm/mach/time.h> | 25 | #include <asm/mach/time.h> |
26 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
27 | #include <mach/iomux-mx21.h> | 27 | #include <mach/iomux-mx21.h> |
28 | #include <mach/mxc_nand.h> | ||
29 | 28 | ||
30 | #include "devices-imx21.h" | 29 | #include "devices-imx21.h" |
31 | 30 | ||
diff --git a/arch/arm/mach-imx/mach-mx25_3ds.c b/arch/arm/mach-imx/mach-mx25_3ds.c index 378f4334378c..58ea3fdf0911 100644 --- a/arch/arm/mach-imx/mach-mx25_3ds.c +++ b/arch/arm/mach-imx/mach-mx25_3ds.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <linux/irq.h> | 29 | #include <linux/irq.h> |
30 | #include <linux/gpio.h> | 30 | #include <linux/gpio.h> |
31 | #include <linux/platform_device.h> | 31 | #include <linux/platform_device.h> |
32 | #include <linux/input/matrix_keypad.h> | ||
33 | #include <linux/usb/otg.h> | 32 | #include <linux/usb/otg.h> |
34 | 33 | ||
35 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
diff --git a/arch/arm/mach-imx/mach-mx27ads.c b/arch/arm/mach-imx/mach-mx27ads.c index 367d1e4384c7..1db79506f5e4 100644 --- a/arch/arm/mach-imx/mach-mx27ads.c +++ b/arch/arm/mach-imx/mach-mx27ads.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <asm/mach/map.h> | 29 | #include <asm/mach/map.h> |
30 | #include <mach/gpio.h> | 30 | #include <mach/gpio.h> |
31 | #include <mach/iomux-mx27.h> | 31 | #include <mach/iomux-mx27.h> |
32 | #include <mach/mxc_nand.h> | ||
33 | 32 | ||
34 | #include "devices-imx27.h" | 33 | #include "devices-imx27.h" |
35 | 34 | ||
diff --git a/arch/arm/mach-imx/mach-mxt_td60.c b/arch/arm/mach-imx/mach-mxt_td60.c index 69787c30c320..2774541511e7 100644 --- a/arch/arm/mach-imx/mach-mxt_td60.c +++ b/arch/arm/mach-imx/mach-mxt_td60.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <asm/mach/map.h> | 29 | #include <asm/mach/map.h> |
30 | #include <linux/gpio.h> | 30 | #include <linux/gpio.h> |
31 | #include <mach/iomux-mx27.h> | 31 | #include <mach/iomux-mx27.h> |
32 | #include <mach/mxc_nand.h> | ||
33 | #include <linux/i2c/pca953x.h> | 32 | #include <linux/i2c/pca953x.h> |
34 | 33 | ||
35 | #include "devices-imx27.h" | 34 | #include "devices-imx27.h" |
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c index 63e182556778..bbddc5a11c43 100644 --- a/arch/arm/mach-imx/mach-pca100.c +++ b/arch/arm/mach-imx/mach-pca100.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include <mach/iomux-mx27.h> | 37 | #include <mach/iomux-mx27.h> |
38 | #include <asm/mach/time.h> | 38 | #include <asm/mach/time.h> |
39 | #include <mach/audmux.h> | 39 | #include <mach/audmux.h> |
40 | #include <mach/mxc_nand.h> | ||
41 | #include <mach/irqs.h> | 40 | #include <mach/irqs.h> |
42 | #include <mach/ulpi.h> | 41 | #include <mach/ulpi.h> |
43 | 42 | ||
diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c index 4cbce6d0fef1..853bb871c7ed 100644 --- a/arch/arm/mach-imx/mach-pcm038.c +++ b/arch/arm/mach-imx/mach-pcm038.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include <mach/common.h> | 36 | #include <mach/common.h> |
37 | #include <mach/hardware.h> | 37 | #include <mach/hardware.h> |
38 | #include <mach/iomux-mx27.h> | 38 | #include <mach/iomux-mx27.h> |
39 | #include <mach/mxc_nand.h> | ||
40 | #include <mach/ulpi.h> | 39 | #include <mach/ulpi.h> |
41 | 40 | ||
42 | #include "devices-imx27.h" | 41 | #include "devices-imx27.h" |