diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
| commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
| tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /include/linux/serial.h | |
| parent | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff) | |
| parent | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
Diffstat (limited to 'include/linux/serial.h')
| -rw-r--r-- | include/linux/serial.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/serial.h b/include/linux/serial.h index 33fc8cb8ddfb..deb714314fb1 100644 --- a/include/linux/serial.h +++ b/include/linux/serial.h | |||
| @@ -177,11 +177,5 @@ struct serial_icounter_struct { | |||
| 177 | #ifdef __KERNEL__ | 177 | #ifdef __KERNEL__ |
| 178 | #include <linux/compiler.h> | 178 | #include <linux/compiler.h> |
| 179 | 179 | ||
| 180 | /* Allow architectures to override entries in serial8250_ports[] at run time: */ | ||
| 181 | struct uart_port; /* forward declaration */ | ||
| 182 | extern int early_serial_setup(struct uart_port *port); | ||
| 183 | extern int early_serial_console_init(char *options); | ||
| 184 | extern int serial8250_start_console(struct uart_port *port, char *options); | ||
| 185 | |||
| 186 | #endif /* __KERNEL__ */ | 180 | #endif /* __KERNEL__ */ |
| 187 | #endif /* _LINUX_SERIAL_H */ | 181 | #endif /* _LINUX_SERIAL_H */ |