aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx1
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2009-04-29 13:14:19 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2009-05-07 16:19:59 +0200
commit5b68421f41b47dd9311b81d9e0d7e9781c2983f3 (patch)
treee4908707a88231b3fa1c470f81ec0884286b17ad /arch/arm/mach-mx1
parenteb05bbeb65cc1015bdd5c4cb72fd1694a3288e97 (diff)
mx1ads: remove ifdefs, reorder include alphabetically
header is part of the kernel now. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx1')
-rw-r--r--arch/arm/mach-mx1/mx1ads.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/mach-mx1/mx1ads.c b/arch/arm/mach-mx1/mx1ads.c
index 7a648c18393..1d28598bcc3 100644
--- a/arch/arm/mach-mx1/mx1ads.c
+++ b/arch/arm/mach-mx1/mx1ads.c
@@ -12,24 +12,24 @@
* warranty of any kind, whether express or implied.
*/
-#include <linux/kernel.h>
+#include <linux/i2c.h>
+#include <linux/i2c/pcf857x.h>
#include <linux/init.h>
+#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/mtd/physmap.h>
-#include <linux/i2c.h>
-#include <linux/i2c/pcf857x.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
-#include <mach/irqs.h>
-#include <mach/hardware.h>
#include <mach/common.h>
-#include <mach/imx-uart.h>
-#include <mach/irqs.h>
+#include <mach/hardware.h>
#include <mach/i2c.h>
+#include <mach/imx-uart.h>
#include <mach/iomux.h>
+#include <mach/irqs.h>
+
#include "devices.h"
/*
@@ -111,7 +111,6 @@ static struct platform_device flash_device = {
/*
* I2C
*/
-
static int i2c_pins[] = {
PA15_PF_I2C_SDA,
PA16_PF_I2C_SCL,