diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 10:32:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 10:32:56 -0500 |
| commit | 4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch) | |
| tree | 50774592eaba942cf378fca731d307f901b737b7 /arch/arm/mach-iop3xx | |
| parent | eb16292ba8a6655a560ab10a7d73a7816f0c0ac0 (diff) | |
| parent | 8576762ff5d109b841fcf4e7d3883e0cf794f3cf (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Manual #include fixups for clashes - there may be some unnecessary
Diffstat (limited to 'arch/arm/mach-iop3xx')
| -rw-r--r-- | arch/arm/mach-iop3xx/iop321-setup.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-iop3xx/iop331-setup.c | 2 |
2 files changed, 2 insertions, 2 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> |
diff --git a/arch/arm/mach-iop3xx/iop331-setup.c b/arch/arm/mach-iop3xx/iop331-setup.c index a2533c3ab42f..53f60614498b 100644 --- a/arch/arm/mach-iop3xx/iop331-setup.c +++ b/arch/arm/mach-iop3xx/iop331-setup.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/major.h> | 16 | #include <linux/major.h> |
| 17 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
| 18 | #include <linux/device.h> | 18 | #include <linux/platform_device.h> |
| 19 | #include <linux/serial.h> | 19 | #include <linux/serial.h> |
| 20 | #include <linux/tty.h> | 20 | #include <linux/tty.h> |
| 21 | #include <linux/serial_core.h> | 21 | #include <linux/serial_core.h> |