diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 23:57:31 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 23:57:31 +0400 |
commit | 526b264163068f77c5f2409031f5e25caf3900a9 (patch) | |
tree | 196e7581f1546e48ba392ff099f369e5c622636b /arch/arm/mach-mxs/mach-mx23evk.c | |
parent | 4c4cbce68f57555cddb9d77da333bf50875148ce (diff) | |
parent | 05d900c9d8ce536c6792efb323c82b1c97b54bf9 (diff) | |
download | linux-526b264163068f77c5f2409031f5e25caf3900a9.tar.xz |
Merge branch 'imx/cleanup' into imx/devel
This helps resolve the conflicts between the imx cleanups and the
new code that has gone into the imx tree.
Conflict resolution was originally done by Sascha Hauer.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mxs/mach-mx23evk.c')
-rw-r--r-- | arch/arm/mach-mxs/mach-mx23evk.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/mach-mx23evk.c b/arch/arm/mach-mxs/mach-mx23evk.c index 2c8eb7c43f82..a1d132dce5c3 100644 --- a/arch/arm/mach-mxs/mach-mx23evk.c +++ b/arch/arm/mach-mxs/mach-mx23evk.c @@ -15,7 +15,6 @@ #include <linux/delay.h> #include <linux/platform_device.h> #include <linux/gpio.h> -#include <linux/irq.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> |