diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /include/linux/serial.h | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'include/linux/serial.h')
| -rw-r--r-- | include/linux/serial.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/serial.h b/include/linux/serial.h index 12cd9cf65e8f..33fc8cb8ddfb 100644 --- a/include/linux/serial.h +++ b/include/linux/serial.h | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #define _LINUX_SERIAL_H | 11 | #define _LINUX_SERIAL_H |
| 12 | 12 | ||
| 13 | #ifdef __KERNEL__ | 13 | #ifdef __KERNEL__ |
| 14 | #include <linux/types.h> | ||
| 14 | #include <asm/page.h> | 15 | #include <asm/page.h> |
| 15 | 16 | ||
| 16 | /* | 17 | /* |