summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mx1ads.c
diff options
context:
space:
mode:
authorSteven Whitehouse <steve@men-an-tol.chygwyn.com>2006-02-23 09:49:43 +0000
committerSteven Whitehouse <swhiteho@redhat.com>2006-02-23 09:49:43 +0000
commitd35462b4bb847b68321c55e95c926aa485aecce2 (patch)
treeb08e18bf6e672633402871ee763102fdb5e63229 /arch/arm/mach-imx/mx1ads.c
parent91ffd7db71e7451f89941a8f428b4daa2a7c1e38 (diff)
parent9e956c2dac9bec602ed1ba29181b45ba6d2b6448 (diff)
downloadkernel-crypto-d35462b4bb847b68321c55e95c926aa485aecce2.tar.gz
kernel-crypto-d35462b4bb847b68321c55e95c926aa485aecce2.tar.xz
kernel-crypto-d35462b4bb847b68321c55e95c926aa485aecce2.zip
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-imx/mx1ads.c')
-rw-r--r--arch/arm/mach-imx/mx1ads.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c
index dc31e3fd6c5..8ab1b040288 100644
--- a/arch/arm/mach-imx/mx1ads.c
+++ b/arch/arm/mach-imx/mx1ads.c
@@ -27,7 +27,6 @@
#include <asm/mach/arch.h>
#include <linux/interrupt.h>
#include "generic.h"
-#include <asm/serial.h>
static struct resource cs89x0_resources[] = {
[0] = {