diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-09 02:21:22 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-09 02:21:22 +0300 |
| commit | 17be03f0a1f42ccfccb38f7d0a94c0f0169634a6 (patch) | |
| tree | 8fe4fc7a987547c546e7b493eecb3607a9583795 /arch/arm | |
| parent | cce0cac125623f9b68f25dd1350f6d616220a8dd (diff) | |
| parent | 85d1494e5ff8e20a52ce514584ffda4f0265025e (diff) | |
| download | linux-17be03f0a1f42ccfccb38f7d0a94c0f0169634a6.tar.xz | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'arch/arm')
| -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 dc31e3fd6c57..8ab1b040288c 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] = { |