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 /drivers/serial/mpsc.c | |
| 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 'drivers/serial/mpsc.c')
| -rw-r--r-- | drivers/serial/mpsc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c index aec83f577ce6..ba8838b234da 100644 --- a/drivers/serial/mpsc.c +++ b/drivers/serial/mpsc.c | |||
| @@ -52,6 +52,8 @@ | |||
| 52 | * 4) AFAICT, hardware flow control isn't supported by the controller --MAG. | 52 | * 4) AFAICT, hardware flow control isn't supported by the controller --MAG. |
| 53 | */ | 53 | */ |
| 54 | 54 | ||
| 55 | #include <linux/platform_device.h> | ||
| 56 | |||
| 55 | #include "mpsc.h" | 57 | #include "mpsc.h" |
| 56 | 58 | ||
| 57 | /* | 59 | /* |