diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-04-29 07:14:19 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-05-07 10:19:59 -0400 |
commit | 5b68421f41b47dd9311b81d9e0d7e9781c2983f3 (patch) | |
tree | e4908707a88231b3fa1c470f81ec0884286b17ad | |
parent | eb05bbeb65cc1015bdd5c4cb72fd1694a3288e97 (diff) |
mx1ads: remove ifdefs, reorder include alphabetically
header is part of the kernel now.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | arch/arm/mach-mx1/mx1ads.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/mach-mx1/mx1ads.c b/arch/arm/mach-mx1/mx1ads.c index 7a648c183930..1d28598bcc37 100644 --- a/arch/arm/mach-mx1/mx1ads.c +++ b/arch/arm/mach-mx1/mx1ads.c | |||
@@ -12,24 +12,24 @@ | |||
12 | * warranty of any kind, whether express or implied. | 12 | * warranty of any kind, whether express or implied. |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include <linux/kernel.h> | 15 | #include <linux/i2c.h> |
16 | #include <linux/i2c/pcf857x.h> | ||
16 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/kernel.h> | ||
17 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
18 | #include <linux/mtd/physmap.h> | 20 | #include <linux/mtd/physmap.h> |
19 | #include <linux/i2c.h> | ||
20 | #include <linux/i2c/pcf857x.h> | ||
21 | 21 | ||
22 | #include <asm/mach-types.h> | 22 | #include <asm/mach-types.h> |
23 | #include <asm/mach/arch.h> | 23 | #include <asm/mach/arch.h> |
24 | #include <asm/mach/time.h> | 24 | #include <asm/mach/time.h> |
25 | 25 | ||
26 | #include <mach/irqs.h> | ||
27 | #include <mach/hardware.h> | ||
28 | #include <mach/common.h> | 26 | #include <mach/common.h> |
29 | #include <mach/imx-uart.h> | 27 | #include <mach/hardware.h> |
30 | #include <mach/irqs.h> | ||
31 | #include <mach/i2c.h> | 28 | #include <mach/i2c.h> |
29 | #include <mach/imx-uart.h> | ||
32 | #include <mach/iomux.h> | 30 | #include <mach/iomux.h> |
31 | #include <mach/irqs.h> | ||
32 | |||
33 | #include "devices.h" | 33 | #include "devices.h" |
34 | 34 | ||
35 | /* | 35 | /* |
@@ -111,7 +111,6 @@ static struct platform_device flash_device = { | |||
111 | /* | 111 | /* |
112 | * I2C | 112 | * I2C |
113 | */ | 113 | */ |
114 | |||
115 | static int i2c_pins[] = { | 114 | static int i2c_pins[] = { |
116 | PA15_PF_I2C_SDA, | 115 | PA15_PF_I2C_SDA, |
117 | PA16_PF_I2C_SCL, | 116 | PA16_PF_I2C_SCL, |