summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-mx21ads.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-20 11:38:27 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-20 11:38:27 +0200
commitc721be2807467819d16db4d61a4c5db539bcc1c7 (patch)
treeee166b44ad37480d3f05b6a0930bd69e16c6fbf9 /arch/arm/mach-imx/mach-mx21ads.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable (diff)
parentARM: imx: move mx3 support to mach-imx (diff)
downloadlinux-c721be2807467819d16db4d61a4c5db539bcc1c7.tar.xz
linux-c721be2807467819d16db4d61a4c5db539bcc1c7.zip
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-imx/mach-mx21ads.c')
-rw-r--r--arch/arm/mach-imx/mach-mx21ads.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx21ads.c b/arch/arm/mach-imx/mach-mx21ads.c
index fa52a1086eae..74ac88978ddd 100644
--- a/arch/arm/mach-imx/mach-mx21ads.c
+++ b/arch/arm/mach-imx/mach-mx21ads.c
@@ -25,7 +25,6 @@
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <mach/iomux-mx21.h>
-#include <mach/mxc_nand.h>
#include "devices-imx21.h"