diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
| commit | de2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch) | |
| tree | dfccb1a2717a8a042a87dbade509f894810ea1cd /arch/arm/mach-iop3xx/iop321-setup.c | |
| parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
| parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/arm/mach-iop3xx/iop321-setup.c')
| -rw-r--r-- | arch/arm/mach-iop3xx/iop321-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-iop3xx/iop321-setup.c b/arch/arm/mach-iop3xx/iop321-setup.c index bb5091223b63..80770233b8d4 100644 --- a/arch/arm/mach-iop3xx/iop321-setup.c +++ b/arch/arm/mach-iop3xx/iop321-setup.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/major.h> | 17 | #include <linux/major.h> |
| 18 | #include <linux/fs.h> | 18 | #include <linux/fs.h> |
| 19 | #include <linux/device.h> | 19 | #include <linux/platform_device.h> |
| 20 | #include <linux/serial.h> | 20 | #include <linux/serial.h> |
| 21 | #include <linux/tty.h> | 21 | #include <linux/tty.h> |
| 22 | #include <linux/serial_core.h> | 22 | #include <linux/serial_core.h> |