diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-19 17:49:39 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-19 17:49:39 -0400 |
| commit | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (patch) | |
| tree | 42a0c0408fcf76024eb6885a27d4f1ed0228abcf /include/linux/serial.h | |
| parent | ce625a801664d8ed7344117bbb57510e4e0e872c (diff) | |
| parent | f60f700876cd51de9de69f3a3c865d95e287a24d (diff) | |
Merge with /shiny/git/linux-2.6/.git
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 */ |