diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 02:15:43 -0500 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 02:15:43 -0500 |
commit | 2be7a906752abf8dce9350c23b6d1036049a5d3e (patch) | |
tree | ef178fa5801bdce24938819086662bb747d8c0c2 /arch/arm/mach-ixp2000/enp2611.c | |
parent | aaf8a7a2949481482200686c7bd3852e5be2e093 (diff) | |
parent | fbf1769d08a8b085834dceb228540153ac2cd534 (diff) |
Merge Paulus' tree
Diffstat (limited to 'arch/arm/mach-ixp2000/enp2611.c')
-rw-r--r-- | arch/arm/mach-ixp2000/enp2611.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c index 9aa54de44740..643f5e1c3d93 100644 --- a/arch/arm/mach-ixp2000/enp2611.c +++ b/arch/arm/mach-ixp2000/enp2611.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <linux/serial.h> | 32 | #include <linux/serial.h> |
33 | #include <linux/tty.h> | 33 | #include <linux/tty.h> |
34 | #include <linux/serial_core.h> | 34 | #include <linux/serial_core.h> |
35 | #include <linux/device.h> | 35 | #include <linux/platform_device.h> |
36 | 36 | ||
37 | #include <asm/io.h> | 37 | #include <asm/io.h> |
38 | #include <asm/irq.h> | 38 | #include <asm/irq.h> |