diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-16 23:06:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-16 23:06:51 -0400 |
| commit | f60f700876cd51de9de69f3a3c865d95e287a24d (patch) | |
| tree | 4ef50e96c385ed076465aac23f52902467e7d825 /include/linux/serial.h | |
| parent | c6c621b3a977b20d7ceffd3debcacbe3de7c0e87 (diff) | |
| parent | 6d283d271674b1127881ebf082266a2c3fe6e0e4 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include/linux/serial.h')
| -rw-r--r-- | include/linux/serial.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/serial.h b/include/linux/serial.h index 00145822fb74..9f2d85284d0b 100644 --- a/include/linux/serial.h +++ b/include/linux/serial.h | |||
| @@ -174,9 +174,11 @@ struct serial_icounter_struct { | |||
| 174 | 174 | ||
| 175 | 175 | ||
| 176 | #ifdef __KERNEL__ | 176 | #ifdef __KERNEL__ |
| 177 | #include <linux/compiler.h> | ||
| 178 | |||
| 177 | /* Export to allow PCMCIA to use this - Dave Hinds */ | 179 | /* Export to allow PCMCIA to use this - Dave Hinds */ |
| 178 | extern int register_serial(struct serial_struct *req); | 180 | extern int __deprecated register_serial(struct serial_struct *req); |
| 179 | extern void unregister_serial(int line); | 181 | extern void __deprecated unregister_serial(int line); |
| 180 | 182 | ||
| 181 | /* Allow architectures to override entries in serial8250_ports[] at run time: */ | 183 | /* Allow architectures to override entries in serial8250_ports[] at run time: */ |
| 182 | struct uart_port; /* forward declaration */ | 184 | struct uart_port; /* forward declaration */ |