From 5b68421f41b47dd9311b81d9e0d7e9781c2983f3 Mon Sep 17 00:00:00 2001 From: Sascha Hauer <s.hauer@pengutronix.de> Date: Wed, 29 Apr 2009 13:14:19 +0200 Subject: mx1ads: remove ifdefs, reorder include alphabetically header is part of the kernel now. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- arch/arm/mach-mx1/mx1ads.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'arch/arm/mach-mx1') 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 @@ * 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, -- cgit v1.2.3