diff options
| author | Arnd Bergmann | 2011-10-07 21:57:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2011-10-07 21:57:31 +0200 |
| commit | 526b264163068f77c5f2409031f5e25caf3900a9 (patch) | |
| tree | 196e7581f1546e48ba392ff099f369e5c622636b /arch/arm/mach-mx5/board-mx51_3ds.c | |
| parent | ARM: mx5: fix clock usage for suspend (diff) | |
| parent | Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanup (diff) | |
| download | kernel-qcow2-linux-526b264163068f77c5f2409031f5e25caf3900a9.tar.gz kernel-qcow2-linux-526b264163068f77c5f2409031f5e25caf3900a9.tar.xz kernel-qcow2-linux-526b264163068f77c5f2409031f5e25caf3900a9.zip | |
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-mx5/board-mx51_3ds.c')
| -rw-r--r-- | arch/arm/mach-mx5/board-mx51_3ds.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/board-mx51_3ds.c b/arch/arm/mach-mx5/board-mx51_3ds.c index 5f4a168e30ba..067d8c4eb656 100644 --- a/arch/arm/mach-mx5/board-mx51_3ds.c +++ b/arch/arm/mach-mx5/board-mx51_3ds.c @@ -25,7 +25,6 @@ #include <mach/3ds_debugboard.h> #include "devices-imx51.h" -#include "devices.h" #define EXPIO_PARENT_INT gpio_to_irq(IMX_GPIO_NR(1, 6)) #define MX51_3DS_ECSPI2_CS (GPIO_PORTC + 28) |