diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 19:57:31 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 19:57:31 (GMT) |
| commit | 526b264163068f77c5f2409031f5e25caf3900a9 (patch) | |
| tree | 196e7581f1546e48ba392ff099f369e5c622636b /arch/arm/mach-mxs/mach-stmp378x_devb.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-stmp378x_devb.c')
| -rw-r--r-- | arch/arm/mach-mxs/mach-stmp378x_devb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/mach-stmp378x_devb.c b/arch/arm/mach-mxs/mach-stmp378x_devb.c index afec337..177e531 100644 --- a/arch/arm/mach-mxs/mach-stmp378x_devb.c +++ b/arch/arm/mach-mxs/mach-stmp378x_devb.c @@ -19,7 +19,6 @@ #include <linux/platform_device.h> #include <linux/gpio.h> -#include <linux/irq.h> #include <linux/spi/spi.h> #include <asm/mach-types.h> |