diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:58:59 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:58:59 -0500 |
commit | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (patch) | |
tree | 73cd85e5529a01fa2338ab6d58b99c36dd666cbe /arch/arm/mach-imx/mx1ads.c | |
parent | ddef9bb367b19383df627e388cb4c01c86ddba6c (diff) | |
parent | 0bdd340c092b0936f78a54bdbd3927463ed4fca3 (diff) | |
download | kernel-crypto-cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa.tar.gz kernel-crypto-cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa.tar.xz kernel-crypto-cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa.zip |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-imx/mx1ads.c')
-rw-r--r-- | arch/arm/mach-imx/mx1ads.c | 1 |
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] = { |